The patch titled
sgiioc4: Always share IRQ
has been added to the -mm tree. Its filename is
sgiioc4-always-share-irq.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sgiioc4: Always share IRQ
From: Brent Casavant <bcasavan@xxxxxxx>
The SGI IOC4 IDE device always shares an interrupt with other devices which
are part of IOC4. As such, IDEPCI_SHARE_IRQ should always be enabled when
BLK_DEV_SGIIOC4 is enabled.
Signed-off-by: Brent Casavant <bcasavan@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/configs/sn2_defconfig | 2 +-
arch/ia64/defconfig | 2 +-
drivers/ide/Kconfig | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff -puN arch/ia64/configs/sn2_defconfig~sgiioc4-always-share-irq arch/ia64/configs/sn2_defconfig
--- a/arch/ia64/configs/sn2_defconfig~sgiioc4-always-share-irq
+++ a/arch/ia64/configs/sn2_defconfig
@@ -363,7 +363,7 @@ CONFIG_BLK_DEV_IDECD=y
#
CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
diff -puN arch/ia64/defconfig~sgiioc4-always-share-irq arch/ia64/defconfig
--- a/arch/ia64/defconfig~sgiioc4-always-share-irq
+++ a/arch/ia64/defconfig
@@ -366,7 +366,7 @@ CONFIG_BLK_DEV_IDESCSI=m
# CONFIG_IDE_GENERIC is not set
# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=y
# CONFIG_BLK_DEV_OPTI621 is not set
diff -puN drivers/ide/Kconfig~sgiioc4-always-share-irq drivers/ide/Kconfig
--- a/drivers/ide/Kconfig~sgiioc4-always-share-irq
+++ a/drivers/ide/Kconfig
@@ -688,6 +688,7 @@ 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
help
This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
chipset, which has one channel and can support two devices.
_
Patches currently in -mm which might be from bcasavan@xxxxxxx are
sgiioc4-always-share-irq.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
