--- linux/drivers/usb/hiddev.c	Tue Nov 13 09:23:58 2001
+++ /home/bongani/dev/c/kernel/hiddev.c	Tue Dec 11 21:33:06 2001
@@ -193,7 +193,6 @@
 	struct hiddev_list *list = file->private_data;
 	struct hiddev_list **listptr;
 
-	lock_kernel();
 	listptr = &list->hiddev->list;
 	hiddev_fasync(-1, file, 0);
 
@@ -209,7 +208,6 @@
 	}
 
 	kfree(list);
-	unlock_kernel();
 
 	return 0;
 }
@@ -567,6 +565,7 @@
 	fasync:		hiddev_fasync,
 };
 
+#ifdef CONFIG_USB_HIDDEV
 /*
  * This is where hid.c calls us to connect a hid device to the hiddev driver
  */
@@ -630,6 +629,7 @@
 		hiddev_cleanup(hiddev);
 	}
 }
+#endif
 
 /* Currently this driver is a USB driver.  It's not a conventional one in
  * the sense that it doesn't probe at the USB level.  Instead it waits to
@@ -662,6 +662,7 @@
 	minor:	HIDDEV_MINOR_BASE
 };
 
+#ifdef CONFIG_USB_HIDDEV
 int __init hiddev_init(void)
 {
 	hiddev_devfs_handle =
@@ -675,3 +676,5 @@
 	devfs_unregister(hiddev_devfs_handle);
 	usb_deregister(&hiddev_driver);
 }
+#endif
+