Merge branch 'upstream-fixes' into upstream

2 files changed, 3 insertions, 14 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index d1266fe2d1ab..b6fb167e20f6 100644
--- a/drivers/ide/Kconfig
+++ b/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.
@@ -773,20 +774,6 @@ config BLK_DEV_IDEDMA_PMAC
           to transfer data to and from memory.  Saying Y is safe and improves
           performance.
 
-config BLK_DEV_IDE_PMAC_BLINK
-        bool "Blink laptop LED on drive activity (DEPRECATED)"
-        depends on BLK_DEV_IDE_PMAC && ADB_PMU
-        select ADB_PMU_LED
-        select LEDS_TRIGGERS
-        select LEDS_TRIGGER_IDE_DISK
-        help
-          This option enables the use of the sleep LED as a hard drive
-          activity LED.
-          This option is deprecated, it only selects ADB_PMU_LED and
-          LEDS_TRIGGER_IDE_DISK and changes the code in the new led class
-          device to default to the ide-disk trigger (which should be set
-          from userspace via sysfs).
-
 config BLK_DEV_IDE_SWARM
         tristate "IDE for Sibyte evaluation boards"
         depends on SIBYTE_SB1xxx_SOC
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 657165297dc7..77703acaec17 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -23,6 +23,7 @@
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/bitops.h>
+#include <linux/nmi.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -1243,6 +1244,7 @@ int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
                 if (stat == 0xff)
                         return -ENODEV;
                 touch_softlockup_watchdog();
+                touch_nmi_watchdog();
         }
         return -EBUSY;
 }