patch-2.4.0-test2 linux/drivers/char/tuner.c

• Lines: 36
• Date: Tue Jun 20 07:37:58 2000
• Orig file: v2.4.0-test1/linux/drivers/char/tuner.c
• Orig date: Tue Apr 11 15:09:17 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/tuner.c linux/drivers/char/tuner.c
@@ -10,6 +10,7 @@
 #include <linux/i2c.h>
 #include <linux/types.h>
 #include <linux/videodev.h>
+#include <linux/init.h>
 
 #include "tuner.h"
 #include "audiochip.h"
@@ -428,22 +429,19 @@
 
 EXPORT_NO_SYMBOLS;
 
-#ifdef MODULE
-int init_module(void)
-#else
-int i2c_tuner_init(void)
-#endif
+int tuner_init_module(void)
 {
 	i2c_add_driver(&driver);
 	return 0;
 }
 
-#ifdef MODULE
-void cleanup_module(void)
+void tuner_cleanup_module(void)
 {
 	i2c_del_driver(&driver);
 }
-#endif
+
+module_init(tuner_init_module);
+module_exit(tuner_cleanup_module);
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.