Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f1ca6d37f991347b87d86430db42e2ab139d1b1d
Commit:     f1ca6d37f991347b87d86430db42e2ab139d1b1d
Parent:     7b5da4be3718c6b4cd771fb82e3e481b04790f0e
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 25 22:17:08 2008 +0100
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 22:17:08 2008 +0100

    ide: remove CONFIG_IDEPCI_SHARE_IRQ config option
    
    We can safely remove CONFIG_IDEPCI_SHARE_IRQ and always support
    PCI IRQ sharing.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/Kconfig    |   12 ------------
 drivers/ide/ide-iops.c |    2 --
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index fb06555..ee01e27 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -374,17 +374,6 @@ comment "PCI IDE chipsets support"
 config BLK_DEV_IDEPCI
        bool
 
-config IDEPCI_SHARE_IRQ
-       bool "Sharing PCI IDE interrupts support"
-       depends on BLK_DEV_IDEPCI
-       help
-         Some ATA/IDE chipsets have hardware support which allows for
-         sharing a single IRQ with other cards. To enable support for
-         this in the ATA/IDE driver, say Y here.
-
-         It is safe to say Y to this question, in most cases.
-         If unsure, say N.
-
 config IDEPCI_PCIBUS_ORDER
        def_bool BLK_DEV_IDE=y && BLK_DEV_IDEPCI
 
@@ -707,7 +696,6 @@ config BLK_DEV_SVWKS
 config BLK_DEV_SGIIOC4
        tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
        depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
-       select IDEPCI_SHARE_IRQ
        select BLK_DEV_IDEDMA_PCI
        help
          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 4aac1cc..6a6d1c1 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)
        udelay(1);
 #endif
 
-#ifdef CONFIG_IDEPCI_SHARE_IRQ
        /*
         * We do a passive status test under shared PCI interrupts on
         * cards that truly share the ATA side interrupt, but may also share
@@ -459,7 +458,6 @@ int drive_is_ready (ide_drive_t *drive)
        if (IDE_CONTROL_REG)
                stat = hwif->INB(IDE_ALTSTATUS_REG);
        else
-#endif /* CONFIG_IDEPCI_SHARE_IRQ */
                /* Note: this may clear a pending IRQ!! */
                stat = hwif->INB(IDE_STATUS_REG);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to