[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>
This commit is contained in:
parent
2db5f59ca7
commit
f39d88adc5
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue