---

yaml --- r: 39390 b: refs/heads/master c: f39d88a h: refs/heads/master v: v3
git-mirror · Oct 11, 2006 · 2764bd5 · 2764bd5
1 parent 1328d39
commit 2764bd5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 23 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2db5f59ca74d911f93c39494db1581c3c93d5a29
+refs/heads/master: f39d88adc5daf544cf9ae666a097b595b212871e
diff --git a/trunk/drivers/block/z2ram.c b/trunk/drivers/block/z2ram.c
@@ -329,7 +329,7 @@ static struct kobject *z2_find(dev_t dev, int *part, void *data)
 
 static struct request_queue *z2_queue;
 
-int __init 
+static int __init 
 z2_init(void)
 {
     int ret;
@@ -370,26 +370,7 @@ z2_init(void)
     return ret;
 }
 
-#if defined(MODULE)
-
-MODULE_LICENSE("GPL");
-
-int
-init_module( void )
-{
-    int error;
-
-    error = z2_init();
-    if ( error == 0 )
-    {
-	printk( KERN_INFO DEVICE_NAME ": loaded as module\n" );
-    }
-
-    return error;
-}
-
-void
-cleanup_module( void )
+static void __exit z2_exit(void)
 {
     int i, j;
     blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256);
@@ -425,4 +406,7 @@ cleanup_module( void )
 
     return;
 } 
-#endif
+
+module_init(z2_init);
+module_exit(z2_exit);
+MODULE_LICENSE("GPL");