diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2008-04-28 06:59:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 10:03:31 -0700 |
| commit | 7d896e0b8e37ae7f74088ce74bf81b58b423b48b (patch) | |
| tree | ffdd257141f9d7ecf1753a3f371507d6244a9559 /drivers/ide/arm | |
| parent | b7505680538375e3e562805851e3f061675369b7 (diff) | |
| download | op-kernel-dev-7d896e0b8e37ae7f74088ce74bf81b58b423b48b.zip op-kernel-dev-7d896e0b8e37ae7f74088ce74bf81b58b423b48b.tar.gz | |
more icside breakage (from next ide merge)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/ide/arm')
| -rw-r--r-- | drivers/ide/arm/icside.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 124445c..65038ca 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c @@ -419,17 +419,19 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e hwif = ide_find_port(); if (hwif) { - int i; - /* * Ensure we're using MMIO */ default_hwif_mmiops(hwif); - for (i = 0; i <= 7; i++) { - hwif->io_ports_array[i] = port; - port += 1 << info->stepping; - } + hwif->io_ports.data_addr = port; + hwif->io_ports.error_addr = port + (1 << info->stepping); + hwif->io_ports.nsect_addr = port + (2 << info->stepping); + hwif->io_ports.lbal_addr = port + (3 << info->stepping); + hwif->io_ports.lbam_addr = port + (4 << info->stepping); + hwif->io_ports.lbah_addr = port + (5 << info->stepping); + hwif->io_ports.device_addr = port + (6 << info->stepping); + hwif->io_ports.status_addr = port + (7 << info->stepping); hwif->io_ports.ctl_addr = (unsigned long)base + info->ctrloffset; hwif->irq = ec->irq; |
