Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[pandora-kernel.git] / drivers / ide / legacy / falconide.c

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index b861cfe..2860956 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,
@@ -75,10 +77,16 @@ void __init falconide_init(void)
        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
        if (hwif) {
                u8 index = hwif->index;
+               u8 idx[4] = { index, 0xff, 0xff, 0xff };
 
                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);