[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 14 insertions, 6 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 3e2530d61762..b6e290956214 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1654,12 +1654,6 @@ static struct block_device_operations floppy_fops = {
         .media_changed  = amiga_floppy_change,
 };
 
-void __init amiga_floppy_setup (char *str, int *ints)
-{
-        printk (KERN_INFO "amiflop: Setting default df0 to %x\n", ints[1]);
-        fd_def_df0 = ints[1];
-}
-
 static int __init fd_probe_drives(void)
 {
         int drive,drives,nomem;
@@ -1845,4 +1839,18 @@ void cleanup_module(void)
         unregister_blkdev(FLOPPY_MAJOR, "fd");
 }
 #endif
+
+#else
+static int __init amiga_floppy_setup (char *str)
+{
+        int n;
+        if (!MACH_IS_AMIGA)
+                return 0;
+        if (!get_option(&str, &n))
+                return 0;
+        printk (KERN_INFO "amiflop: Setting default df0 to %x\n", n);
+        fd_def_df0 = n;
+}
+
+__setup("floppy=", amiga_floppy_setup);
 #endif