From 9d71b4b57440fdd9d4b812b899937a850738b946 Mon Sep 17 00:00:00 2001
From: Brent Casavant <bcasavan@sgi.com>
Date: Sun, 30 Jul 2006 03:03:46 -0700
Subject: [PATCH] --- yaml --- r: 32947 b: refs/heads/master c:
 9578bcf4ecaf447cb4bb0891309fad73ff5c00e3 h: refs/heads/master i:   32945:
 187e922165dc4a4799ad4edf88c5d1a14c143d08   32943:
 16236ba5c5dd8c9b74d3957c34ce342c7becf95f v: v3

---
 [refs]                                | 2 +-
 trunk/arch/ia64/configs/sn2_defconfig | 2 +-
 trunk/arch/ia64/defconfig             | 2 +-
 trunk/drivers/ide/Kconfig             | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c86c8a94e9e0..3fc2aef33d54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc7455fa3b5ada2a47d24755cc431f4dfff052cb
+refs/heads/master: 9578bcf4ecaf447cb4bb0891309fad73ff5c00e3
diff --git a/trunk/arch/ia64/configs/sn2_defconfig b/trunk/arch/ia64/configs/sn2_defconfig
index 9ea35398e10d..0f14a82b856e 100644
--- a/trunk/arch/ia64/configs/sn2_defconfig
+++ b/trunk/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 --git a/trunk/arch/ia64/defconfig b/trunk/arch/ia64/defconfig
index 6cba55da572a..9001b3fbaa32 100644
--- a/trunk/arch/ia64/defconfig
+++ b/trunk/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 --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index d1266fe2d1ab..556958ebbf03 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -682,6 +682,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.