Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 9578bcf4ecaf447cb4bb0891309fad73ff5c00e3

Authored by Brent Casavant
Committed by Linus Torvalds
1 parent bc7455fa3b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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: Brent Casavant <bcasavan@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 3 additions and 2 deletions Side-by-side Diff

arch/ia64/configs/sn2_defconfig
Diff comments   View file @ 9578bcf
... ... @@ -363,7 +363,7 @@
363 363 #
364 364 CONFIG_IDE_GENERIC=y
365 365 CONFIG_BLK_DEV_IDEPCI=y
366   -# CONFIG_IDEPCI_SHARE_IRQ is not set
  366 +CONFIG_IDEPCI_SHARE_IRQ=y
367 367 # CONFIG_BLK_DEV_OFFBOARD is not set
368 368 # CONFIG_BLK_DEV_GENERIC is not set
369 369 # CONFIG_BLK_DEV_OPTI621 is not set
... ... @@ -366,7 +366,7 @@
366 366 # CONFIG_IDE_GENERIC is not set
367 367 # CONFIG_BLK_DEV_IDEPNP is not set
368 368 CONFIG_BLK_DEV_IDEPCI=y
369   -# CONFIG_IDEPCI_SHARE_IRQ is not set
  369 +CONFIG_IDEPCI_SHARE_IRQ=y
370 370 # CONFIG_BLK_DEV_OFFBOARD is not set
371 371 CONFIG_BLK_DEV_GENERIC=y
372 372 # CONFIG_BLK_DEV_OPTI621 is not set
... ... @@ -682,6 +682,7 @@
682 682 config BLK_DEV_SGIIOC4
683 683 tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
684 684 depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
  685 + select IDEPCI_SHARE_IRQ
685 686 help
686 687 This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
687 688 chipset, which has one channel and can support two devices.