diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /drivers/usb/usb-core.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'drivers/usb/usb-core.c')
| -rw-r--r-- | drivers/usb/usb-core.c | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/drivers/usb/usb-core.c b/drivers/usb/usb-core.c index 9e7557e8f..60b411761 100644 --- a/drivers/usb/usb-core.c +++ b/drivers/usb/usb-core.c @@ -29,19 +29,13 @@ void usb_major_cleanup(void); * USB device drivers */ -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); -int usb_printer_init(void); int usb_stor_init(void); -int usb_serial_init(void); int dabusb_init(void); -int hid_init(void); -int input_init(void); +int plusb_init(void); int usb_mouse_init(void); int usb_kbd_init(void); int graphire_init(void); @@ -62,9 +56,8 @@ int ohci_hcd_init(void); void cleanup_module(void) { usb_major_cleanup(); - usbdevfs_cleanup(); + usbdevfs_cleanup(); usb_hub_cleanup(); - } /* @@ -81,21 +74,9 @@ int usb_init(void) usb_hub_init(); #ifndef CONFIG_USB_MODULE -#ifdef CONFIG_USB_SCANNER - usb_scanner_init(); -#endif #ifdef CONFIG_USB_AUDIO usb_audio_init(); #endif -#ifdef CONFIG_USB_ACM - usb_acm_init(); -#endif -#ifdef CONFIG_USB_PRINTER - usb_printer_init(); -#endif -#ifdef CONFIG_USB_SERIAL - usb_serial_init(); -#endif #ifdef CONFIG_USB_CPIA usb_cpia_init(); #endif @@ -105,20 +86,14 @@ int usb_init(void) #ifdef CONFIG_USB_OV511 usb_ov511_init(); #endif -#ifdef CONFIG_USB_DC2XX - usb_dc2xx_init(); -#endif #ifdef CONFIG_USB_STORAGE usb_stor_init(); #endif #ifdef CONFIG_USB_DABUSB dabusb_init(); #endif -#if defined(CONFIG_USB_HID) || defined(CONFIG_USB_MOUSE) || defined(CONFIG_USB_KBD) || defined(CONFIG_USB_GRAPHIRE) - input_init(); -#endif -#ifdef CONFIG_USB_HID - hid_init(); +#ifdef CONFIG_USB_PLUSB + plusb_init(); #endif #ifdef CONFIG_USB_MOUSE usb_mouse_init(); |