diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/setup-pci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 63ef8aaa7b90..caa4a6a32711 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
@@ -390,13 +390,9 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port | |||
390 | hw_regs_t hw; | 390 | hw_regs_t hw; |
391 | 391 | ||
392 | memset(&hw, 0, sizeof(hw)); | 392 | memset(&hw, 0, sizeof(hw)); |
393 | #ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT | ||
394 | ide_std_init_ports(&hw, base, ctl | 2); | 393 | ide_std_init_ports(&hw, base, ctl | 2); |
395 | #else | ||
396 | ide_init_hwif_ports(&hw, base, ctl | 2, NULL); | ||
397 | #endif | ||
398 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports)); | 394 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports)); |
399 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; | 395 | hwif->noprobe = 0; |
400 | } | 396 | } |
401 | hwif->chipset = d->chipset ? d->chipset : ide_pci; | 397 | hwif->chipset = d->chipset ? d->chipset : ide_pci; |
402 | hwif->pci_dev = dev; | 398 | hwif->pci_dev = dev; |