Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-sa1100 / ide.h

diff --git a/include/asm-arm/arch-sa1100/ide.h b/include/asm-arm/arch-sa1100/ide.h
index 98b10bcf9f1b87d44058bed3c1f9753415fd1de8..b14cbda01dc3cce14c715ffef836dde3d1fbabe9 100644 (file)
--- a/include/asm-arm/arch-sa1100/ide.h
+++ b/include/asm-arm/arch-sa1100/ide.h
@@ -37,12 +37,12 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
 
        memset(hw, 0, sizeof(*hw));
 
-       for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-               hw->io_ports[i] = reg;
+       for (i = 0; i <= 7; i++) {
+               hw->io_ports_array[i] = reg;
                reg += regincr;
        }
 
-       hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
+       hw->io_ports.ctl_addr = ctrl_port;
 
        if (irq)
                *irq = 0;