Commit 2db5f59c authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] amiga_floppy_init() in non-modular case



It used to be called directly, but that got lost in 2.1.87-pre1.
Similar breakage in ataflop got fixed 3 years ago, this one
had gone unnoticed.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2e811488
......@@ -1709,10 +1709,13 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
return get_disk(unit[drive].gendisk);
}
int __init amiga_floppy_init(void)
static int __init amiga_floppy_init(void)
{
int i, ret;
if (!MACH_IS_AMIGA)
return -ENXIO;
if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENXIO;
......@@ -1809,15 +1812,9 @@ out_blkdev:
return ret;
}
module_init(amiga_floppy_init);
#ifdef MODULE
int init_module(void)
{
if (!MACH_IS_AMIGA)
return -ENXIO;
return amiga_floppy_init();
}
#if 0 /* not safe to unload */
void cleanup_module(void)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment