diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/Kconfig | 3 | ||||
-rw-r--r-- | drivers/ide/setup-pci.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 6d9fd92763f4..6eaece96524e 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -1056,6 +1056,9 @@ endif | |||
1056 | config BLK_DEV_IDEDMA | 1056 | config BLK_DEV_IDEDMA |
1057 | def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 1057 | def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
1058 | 1058 | ||
1059 | config IDE_ARCH_OBSOLETE_INIT | ||
1060 | def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC | ||
1061 | |||
1059 | endif | 1062 | endif |
1060 | 1063 | ||
1061 | config BLK_DEV_HD_ONLY | 1064 | config BLK_DEV_HD_ONLY |
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 252cb8c5931a..875167e11cd1 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
@@ -388,7 +388,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d, | |||
388 | if (hwif->io_ports[IDE_DATA_OFFSET] != base || | 388 | if (hwif->io_ports[IDE_DATA_OFFSET] != base || |
389 | hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) { | 389 | hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) { |
390 | memset(&hwif->hw, 0, sizeof(hwif->hw)); | 390 | memset(&hwif->hw, 0, sizeof(hwif->hw)); |
391 | #ifndef IDE_ARCH_OBSOLETE_INIT | 391 | #ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT |
392 | ide_std_init_ports(&hwif->hw, base, (ctl | 2)); | 392 | ide_std_init_ports(&hwif->hw, base, (ctl | 2)); |
393 | hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0; | 393 | hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0; |
394 | #else | 394 | #else |