Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / ide / legacy / falconide.c

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index c1a84540beb1e860718a65d2beb6ee491ca0a09c..2860956bdcb079196c199e91af40163615670043 100644 (file)
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -62,11 +62,13 @@ EXPORT_SYMBOL(falconide_intr_lock);
      *  Probe for a Falcon IDE interface
      */
 
-void __init falconide_init(void)
+static int __init falconide_init(void)
 {
     if (MACH_IS_ATARI && ATARIHW_PRESENT(IDE)) {
        hw_regs_t hw;
 
+       printk(KERN_INFO "ide: Falcon IDE controller\n");
+
        ide_setup_ports(&hw, ATA_HD_BASE, falconide_offsets,
                        0, 0, NULL,
 //                     falconide_iops,
@@ -80,8 +82,11 @@ void __init falconide_init(void)
                ide_init_port_data(hwif, index);
                ide_init_port_hw(hwif, &hw);
 
-               printk("ide%d: Falcon IDE interface\n", index);
-
                ide_device_add(idx);
        }
+    }
+
+    return 0;
 }
+
+module_init(falconide_init);