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

Next file: linux/drivers/usb/usb-debug.c
Previous file: linux/drivers/usb/uhci.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.40/linux/drivers/usb/usb-core.c linux/drivers/usb/usb-core.c
@@ -32,6 +32,7 @@
 int usb_acm_init(void);
 int usb_audio_init(void);
 int usb_cpia_init(void);
+int usb_ibmcam_init(void);
 int usb_ov511_init(void);
 int usb_dc2xx_init(void);
 int usb_scanner_init(void);
@@ -98,13 +99,16 @@
 #ifdef CONFIG_USB_CPIA
 	usb_cpia_init();
 #endif
+#ifdef CONFIG_USB_IBMCAM
+	usb_ibmcam_init();
+#endif
 #ifdef CONFIG_USB_OV511
 	usb_ov511_init();
 #endif
 #ifdef CONFIG_USB_DC2XX
 	usb_dc2xx_init();
 #endif
-#ifdef CONFIG_USB_SCSI
+#ifdef CONFIG_USB_STORAGE
 	usb_stor_init();
 #endif
 #ifdef CONFIG_USB_DABUSB
@@ -128,7 +132,7 @@
 #ifdef CONFIG_USB_UHCI
 	uhci_init();
 #endif
-#ifdef CONFIG_USB_OHCI_HCD
+#ifdef CONFIG_USB_OHCI
 	ohci_hcd_init(); 
 #endif
 #endif

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