diff -N -r --unified=5 usblock.old9/usblock.c usblock/usblock.c
--- usblock.old9/usblock.c	2007-02-28 02:41:00.000000000 +0100
+++ usblock/usblock.c	2007-03-15 21:06:22.000000000 +0100
@@ -250,11 +250,11 @@
 my_timer.expires = jiffies + lock_timeout;
 timer_active=1;
 add_timer(&my_timer);
 
 resubmit:
-	status = usb_submit_urb (urb, SLAB_ATOMIC);
+	status = usb_submit_urb (urb, GFP_ATOMIC);
 	if (status)
 printk(KERN_INFO "submitting of urb failed!\n");
 }
 
 static int usb_lock_open(struct input_dev *dev)
@@ -309,11 +309,11 @@
 
 	if (!(lock = kmalloc(sizeof(struct usb_lock), GFP_KERNEL))) 
 		return -ENOMEM;
 	memset(lock, 0, sizeof(struct usb_lock));
 
-	lock->data = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &lock->data_dma);
+	lock->data = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &lock->data_dma);
 	if (!lock->data) {
 		kfree(lock);
 		return -ENOMEM;
 	}
 
@@ -369,11 +369,11 @@
 
 
 	usb_set_intfdata(intf, lock);
 
         retval = usb_register_dev(intf,&usb_lock_class);
-	retval = usb_submit_urb (lock->irq, SLAB_ATOMIC);
+	retval = usb_submit_urb (lock->irq, GFP_ATOMIC);
 
 init_timer(&my_timer);
 my_timer.function = my_timer_func;