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

• Lines: 58
• Date: Thu Dec 16 01:27:42 1999
• Orig file: v2.3.33/linux/drivers/usb/usb-core.c
• Orig date: Wed Dec 8 14:11:27 1999

diff -u --recursive --new-file v2.3.33/linux/drivers/usb/usb-core.c linux/drivers/usb/usb-core.c
@@ -9,6 +9,7 @@
  * library, while this file handles starting drivers, etc.
  *
  */
+#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/config.h>
 
@@ -19,9 +20,6 @@
 #	ifdef CONFIG_USB_UHCI
 		int uhci_init(void);
 #	endif
-#	ifdef CONFIG_USB_OHCI
-		int ohci_init(void);
-#	endif
 #	ifdef CONFIG_USB_OHCI_HCD
 		int ohci_hcd_init(void);
 #	endif
@@ -39,9 +37,6 @@
 #	ifdef CONFIG_USB_UHCI
 		uhci_init();
 #	endif
-#	ifdef CONFIG_USB_OHCI
-		ohci_init();
-#	endif
 #	ifdef CONFIG_USB_OHCI_HCD
 		ohci_hcd_init(); 
 #	endif
@@ -75,6 +70,9 @@
 #	ifdef CONFIG_USB_SCSI
 		usb_scsi_init();
 #	endif
+#	ifdef CONFIG_USB_DABUSB
+		dabusb_init();
+#	endif
 #endif
 	return 0;
 }
@@ -88,14 +86,18 @@
 #ifdef CONFIG_USB_PROC
 	proc_usb_cleanup ();
 #endif
-	usb_hub_cleanup();
+	usb_hub_cleanup();	
 #ifndef MODULE
+
 #	ifdef CONFIG_USB_MOUSE
         	usb_mouse_cleanup();
 #	endif
 #       ifdef CONFIG_USB_HP_SCANNER
                 usb_hp_scanner_cleanup();
 #       endif
+#	ifdef CONFIG_USB_DABUSB
+		dabusb_cleanup();
+#	endif
 #endif
 }