patch-2.3.35 linux/drivers/usb/usb-core.c

• Lines: 43
• Date: Mon Dec 27 14:01:53 1999
• Orig file: v2.3.34/linux/drivers/usb/usb-core.c
• Orig date: Mon Dec 20 18:48:22 1999

diff -u --recursive --new-file v2.3.34/linux/drivers/usb/usb-core.c linux/drivers/usb/usb-core.c
@@ -43,8 +43,8 @@
 #	ifdef CONFIG_USB_MOUSE
 		usb_mouse_init();
 #	endif
-#       ifdef CONFIG_USB_HP_SCANNER
-                usb_hp_scanner_init();
+#       ifdef CONFIG_USB_SCANNER
+                usb_scanner_init();
 #       endif
 #	ifdef CONFIG_USB_KBD
 		usb_kbd_init();
@@ -87,16 +87,28 @@
 	proc_usb_cleanup ();
 #endif
 	usb_hub_cleanup();	
-#ifndef MODULE
 
+#ifndef MODULE
 #	ifdef CONFIG_USB_MOUSE
         	usb_mouse_cleanup();
 #	endif
-#       ifdef CONFIG_USB_HP_SCANNER
-                usb_hp_scanner_cleanup();
+#       ifdef CONFIG_USB_SCANNER
+                usb_scanner_cleanup();
 #       endif
 #	ifdef CONFIG_USB_DABUSB
 		dabusb_cleanup();
+#	endif
+#	ifdef CONFIG_USB_KBD
+		usb_kbd_cleanup();
+#	endif
+#	ifdef CONFIG_USB_ACM
+		usb_acm_cleanup();
+#	endif
+#	ifdef CONFIG_USB_CPIA
+		usb_cpia_cleanup();
+#	endif
+#	ifdef CONFIG_USB_DC2XX
+		usb_dc2xx_cleanup();
 #	endif
 #endif
 }