projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
ide
/
pci
/
siimage.c
diff --git
a/drivers/ide/pci/siimage.c
b/drivers/ide/pci/siimage.c
index
20b3929
..
697f566
100644
(file)
--- a/
drivers/ide/pci/siimage.c
+++ b/
drivers/ide/pci/siimage.c
@@
-898,7
+898,6
@@
static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
base = (unsigned long) addr;
hwif->dma_base = base + (ch ? 0x08 : 0x00);
- hwif->dma_base2 = base + (ch ? 0x18 : 0x10);
hwif->mmio = 2;
}