Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2...

[linux-2.6-omap-h63xx.git] / include / asm-cris / arch-v10 / ide.h

diff --git a/include/asm-cris/arch-v10/ide.h b/include/asm-cris/arch-v10/ide.h
index ea34e0d0a3884690a3e66ff7fd1bdeb6a24f596e..5366e62393288e20225811fd764cbfbd04fa367b 100644 (file)
--- a/include/asm-cris/arch-v10/ide.h
+++ b/include/asm-cris/arch-v10/ide.h
@@ -59,22 +59,19 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port, u
        int i;
 
        /* fill in ports for ATA addresses 0 to 7 */
-
-       for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-               hw->io_ports[i] = data_port |
+       for (i = 0; i <= 7; i++) {
+               hw->io_ports_array[i] = data_port |
                        IO_FIELD(R_ATA_CTRL_DATA, addr, i) |
                        IO_STATE(R_ATA_CTRL_DATA, cs0, active);
        }
 
        /* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */
-
-       hw->io_ports[IDE_CONTROL_OFFSET] = data_port |
+       hw->io_ports.ctl_addr = data_port |
                        IO_FIELD(R_ATA_CTRL_DATA, addr, 6) |
                        IO_STATE(R_ATA_CTRL_DATA, cs1, active);
 
        /* whats this for ? */
-
-       hw->io_ports[IDE_IRQ_OFFSET] = 0;
+       hw->io_ports.irq_addr = 0;
 }
 
 static inline void ide_init_default_hwifs(void)