From 1328d390f2d687ad77c700f94fbe404422181aef Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 11 Oct 2006 17:28:37 +0100
Subject: [PATCH] --- yaml --- r: 39389 b: refs/heads/master c:
 2db5f59ca74d911f93c39494db1581c3c93d5a29 h: refs/heads/master i:   39387:
 5cb3baca4e194c5f26cd02e72498830fc55e1c75 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/block/amiflop.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d942a331aaf1..e53f8fc2a9cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e811488cedddefb9d1df97c260b6048ea8ef835
+refs/heads/master: 2db5f59ca74d911f93c39494db1581c3c93d5a29
diff --git a/trunk/drivers/block/amiflop.c b/trunk/drivers/block/amiflop.c
index 5d254b714509..5d6562171533 100644
--- a/trunk/drivers/block/amiflop.c
+++ b/trunk/drivers/block/amiflop.c
@@ -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 @@ int __init amiga_floppy_init(void)
 	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)
 {