patch-2.3.48 linux/drivers/usb/scanner.c

Next file: linux/drivers/usb/usb-core.c
Previous file: linux/drivers/usb/printer.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.47/linux/drivers/usb/scanner.c linux/drivers/usb/scanner.c
@@ -817,15 +817,12 @@
        SCN_BASE_MNR
 };
 
-#ifdef MODULE
-void cleanup_module(void)
+void __exit usb_scanner_exit(void)
 {
 	usb_deregister(&scanner_driver);
 }
-int init_module(void)
-#else
-int usb_scanner_init(void)
-#endif
+
+int __init usb_scanner_init(void)
 {
         if (usb_register(&scanner_driver) < 0)
                 return -1;
@@ -834,4 +831,5 @@
 	return 0;
 }
 
-__initcall(usb_scanner_init);
+module_init(usb_scanner_init);
+module_exit(usb_scanner_exit);

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