patch-2.3.99-pre7 linux/drivers/char/n_r3964.c

• Lines: 45
• Date: Wed May 3 01:45:19 2000
• Orig file: v2.3.99-pre6/linux/drivers/char/n_r3964.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/char/n_r3964.c linux/drivers/char/n_r3964.c
@@ -110,8 +110,6 @@
 #define TRACE_Q(fmt, arg...) /**/
 #endif
 
-void cleanup_module(void);
-
 static void on_timer_1(void*);
 static void on_timer_2(void*);
 static void add_tx_queue(struct r3964_info *, struct r3964_block_header *);
@@ -196,11 +194,7 @@
  * Module support routines
  *************************************************************/
 
-#ifdef MODULE
-
-#define r3964_init init_module
-
-void cleanup_module(void)
+static void __exit r3964_exit(void)
 {
    int status;
    
@@ -219,9 +213,6 @@
    
 }
 
-
-#endif /* MODULE */
-
 static int __init r3964_init(void)
 {
    int status;
@@ -248,9 +239,9 @@
    return status;
 }
 
-#ifndef MODULE
-__initcall (r3964_init);
-#endif
+module_init(r3964_init);
+module_exit(r3964_exit);
+
 
 /*************************************************************
  * Protocol implementation routines