Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index eaf5dbe58bc24eeca32e09349348ff29dc35cbc1..caa2632dd08e1f96d5e5e4379b23ea9ea8cc3563 100644 (file)
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -72,9 +72,9 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base,
        memset(hw, 0, sizeof(*hw));
 
        for (i = 0; i < 8; i++)
-               hw->io_ports[i] = base + i * 4;
+               hw->io_ports_array[i] = base + i * 4;
 
-       hw->io_ports[IDE_CONTROL_OFFSET] = base + IDE_CONTROL;
+       hw->io_ports.ctl_addr = base + IDE_CONTROL;
 
        hw->irq = irq;
        hw->ack_intr = ack_intr;
@@ -95,6 +95,9 @@ static int __init macide_init(void)
        int irq;
        hw_regs_t hw;
 
+       if (!MACH_IS_MAC)
+               return -ENODEV;
+
        switch (macintosh_config->ide_type) {
        case MAC_IDE_QUADRA:
                base = IDE_BASE;
@@ -120,7 +123,7 @@ static int __init macide_init(void)
 
        macide_setup_ports(&hw, base, irq, ack_intr);
 
-       hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+       hwif = ide_find_port();
        if (hwif) {
                u8 index = hwif->index;
                u8 idx[4] = { index, 0xff, 0xff, 0xff };
@@ -128,8 +131,6 @@ static int __init macide_init(void)
                ide_init_port_data(hwif, index);
                ide_init_port_hw(hwif, &hw);
 
-               hwif->mmio = 1;
-
                ide_device_add(idx, NULL);
        }