diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-11 17:28:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:17:07 -0700 |
| commit | f39d88adc5daf544cf9ae666a097b595b212871e (patch) | |
| tree | 2aad8a693ca92cb6bf416e8b5b811d600593706b | |
| parent | 2db5f59ca74d911f93c39494db1581c3c93d5a29 (diff) | |
| download | blackbird-op-linux-f39d88adc5daf544cf9ae666a097b595b212871e.tar.gz blackbird-op-linux-f39d88adc5daf544cf9ae666a097b595b212871e.zip | |
[PATCH] z2_init() in non-modular case
... another victim - this time of 2.5.1-pre2
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/block/z2ram.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 82ddbdd7bd4b..7cc2685ca84a 100644 --- a/drivers/block/z2ram.c +++ b/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 @@ err: 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"); |
