Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9578bcf4 authored by Brent Casavant's avatar Brent Casavant Committed by Linus Torvalds
Browse files

[PATCH] sgiioc4: Always share IRQ 



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: default avatarBrent Casavant <bcasavan@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bc7455fa

arch/ia64/configs/sn2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/ia64/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/ide/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.