Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6-omap-h63xx.git] / drivers / ide / legacy / ali14xx.c

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index d4d1a6bea599e3bf93dbae01d4e05dc5ffd2d9f7..bc8b1f8de614d6aef0ae6ab5fd1beaacc13b05d8 100644 (file)
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -200,6 +200,7 @@ static const struct ide_port_info ali14xx_port_info = {
 static int __init ali14xx_probe(void)
 {
        static u8 idx[4] = { 0, 1, 0xff, 0xff };
+       hw_regs_t hw[2];
 
        printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
                          basePort, regOn);
@@ -210,6 +211,17 @@ static int __init ali14xx_probe(void)
                return 1;
        }
 
+       memset(&hw, 0, sizeof(hw));
+
+       ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
+       hw[0].irq = 14;
+
+       ide_std_init_ports(&hw[1], 0x170, 0x376);
+       hw[1].irq = 15;
+
+       ide_init_port_hw(&ide_hwifs[0], &hw[0]);
+       ide_init_port_hw(&ide_hwifs[1], &hw[1]);
+
        ide_hwifs[0].set_pio_mode = &ali14xx_set_pio_mode;
        ide_hwifs[1].set_pio_mode = &ali14xx_set_pio_mode;