aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/Kconfig12
-rw-r--r--drivers/ide/ide-iops.c2
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index fb06555708a8..ee01e273a537 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -374,17 +374,6 @@ comment "PCI IDE chipsets support"
374config BLK_DEV_IDEPCI 374config BLK_DEV_IDEPCI
375 bool 375 bool
376 376
377config IDEPCI_SHARE_IRQ
378 bool "Sharing PCI IDE interrupts support"
379 depends on BLK_DEV_IDEPCI
380 help
381 Some ATA/IDE chipsets have hardware support which allows for
382 sharing a single IRQ with other cards. To enable support for
383 this in the ATA/IDE driver, say Y here.
384
385 It is safe to say Y to this question, in most cases.
386 If unsure, say N.
387
388config IDEPCI_PCIBUS_ORDER 377config IDEPCI_PCIBUS_ORDER
389 def_bool BLK_DEV_IDE=y && BLK_DEV_IDEPCI 378 def_bool BLK_DEV_IDE=y && BLK_DEV_IDEPCI
390 379
@@ -707,7 +696,6 @@ config BLK_DEV_SVWKS
707config BLK_DEV_SGIIOC4 696config BLK_DEV_SGIIOC4
708 tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support" 697 tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
709 depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4 698 depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
710 select IDEPCI_SHARE_IRQ
711 select BLK_DEV_IDEDMA_PCI 699 select BLK_DEV_IDEDMA_PCI
712 help 700 help
713 This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4 701 This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 4aac1cc7101d..6a6d1c188030 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -449,7 +449,6 @@ int drive_is_ready (ide_drive_t *drive)
449 udelay(1); 449 udelay(1);
450#endif 450#endif
451 451
452#ifdef CONFIG_IDEPCI_SHARE_IRQ
453 /* 452 /*
454 * We do a passive status test under shared PCI interrupts on 453 * We do a passive status test under shared PCI interrupts on
455 * cards that truly share the ATA side interrupt, but may also share 454 * cards that truly share the ATA side interrupt, but may also share
@@ -459,7 +458,6 @@ int drive_is_ready (ide_drive_t *drive)
459 if (IDE_CONTROL_REG) 458 if (IDE_CONTROL_REG)
460 stat = hwif->INB(IDE_ALTSTATUS_REG); 459 stat = hwif->INB(IDE_ALTSTATUS_REG);
461 else 460 else
462#endif /* CONFIG_IDEPCI_SHARE_IRQ */
463 /* Note: this may clear a pending IRQ!! */ 461 /* Note: this may clear a pending IRQ!! */
464 stat = hwif->INB(IDE_STATUS_REG); 462 stat = hwif->INB(IDE_STATUS_REG);
465 463