patch-2.3.50 linux/drivers/sound/nm256_audio.c

• Lines: 50
• Date: Tue Mar 7 13:40:24 2000
• Orig file: v2.3.49/linux/drivers/sound/nm256_audio.c
• Orig date: Thu Feb 10 17:11:14 2000

diff -u --recursive --new-file v2.3.49/linux/drivers/sound/nm256_audio.c linux/drivers/sound/nm256_audio.c
@@ -15,6 +15,7 @@
 
 #define __NO_VERSION__
 #include <linux/pci.h>
+#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include "sound_config.h"
@@ -1639,8 +1640,6 @@
 
 EXPORT_SYMBOL(init_nm256);
 
-#ifdef MODULE
-
 static int loaded = 0;
 
 MODULE_PARM (usecache, "i");
@@ -1648,8 +1647,7 @@
 MODULE_PARM (nm256_debug, "i");
 MODULE_PARM (force_load, "i");
 
-int
-init_module (void)
+static int __init do_init_nm256(void)
 {
     nmcard_list = NULL;
     printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1\n");
@@ -1663,8 +1661,7 @@
 	return -ENODEV;
 }
 
-void
-cleanup_module (void)
+static void __exit cleanup_nm256 (void)
 {
     if (loaded) {
 	struct nm256_info *card;
@@ -1688,8 +1685,10 @@
     }
     pm_unregister_all (&handle_pm_event);
 }
-#endif
-
+
+module_init(do_init_nm256);
+module_exit(cleanup_nm256);
+
 /*
  * Local variables:
  *  c-basic-offset: 4