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

Next file: linux/drivers/usb/usb_scsi.c
Previous file: linux/drivers/usb/hub.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.30/linux/drivers/usb/usb-core.c linux/drivers/usb/usb-core.c
@@ -33,6 +33,8 @@
 #ifdef CONFIG_USB_PROC
 	proc_usb_init();
 #endif
+	usb_hub_init();
+
 #ifndef CONFIG_USB_MODULE
 #	ifdef CONFIG_USB_UHCI
 		uhci_init();
@@ -70,9 +72,6 @@
 #	ifdef CONFIG_USB_DC2XX
 		usb_dc2xx_init();
 #	endif
-#	ifdef CONFIG_USB_HUB
-		usb_hub_init();
-#	endif
 #	ifdef CONFIG_USB_SCSI
 		usb_scsi_init();
 #	endif
@@ -89,10 +88,8 @@
 #ifdef CONFIG_USB_PROC
 	proc_usb_cleanup ();
 #endif
+	usb_hub_cleanup();
 #ifndef MODULE
-#	ifdef CONFIG_USB_HUB
-		usb_hub_cleanup();
-#	endif
 #	ifdef CONFIG_USB_MOUSE
         	usb_mouse_cleanup();
 #	endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)