diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /drivers/usb/usb-core.c | |
parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) |
Merge with 2.4.0-test7.
Diffstat (limited to 'drivers/usb/usb-core.c')
-rw-r--r-- | drivers/usb/usb-core.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/usb/usb-core.c b/drivers/usb/usb-core.c index 25d1d24cf..017a99dce 100644 --- a/drivers/usb/usb-core.c +++ b/drivers/usb/usb-core.c @@ -13,6 +13,7 @@ #include <linux/version.h> #include <linux/kernel.h> #include <linux/config.h> +#include <linux/init.h> #include <linux/usb.h> /* @@ -42,13 +43,11 @@ int dsbr100_init(void); int uhci_init(void); int ohci_hcd_init(void); -#ifdef MODULE - /* * Cleanup */ -void cleanup_module(void) +static void __exit usb_exit(void) { usb_major_cleanup(); usbdevfs_cleanup(); @@ -59,10 +58,7 @@ void cleanup_module(void) * Init */ -int init_module(void) -#else -int usb_init(void) -#endif +static int __init usb_init(void) { usb_major_init(); usbdevfs_init(); @@ -99,3 +95,6 @@ int usb_init(void) #endif return 0; } + +module_init(usb_init); +module_exit(usb_exit); |