From 34339b7c23c07bb8285ce5e680be258cf995b1bc Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 8 Nov 2006 19:56:26 -0800
Subject: [PATCH] --- yaml --- r: 42431 b: refs/heads/master c:
 297295ae6653af1356dd35a8edc411e2715aec57 h: refs/heads/master i:   42429:
 7792570aa4f0f1cbe282849f85ece4b49746ae24   42427:
 7ebb093fd902ba7cada4ed431394d47bac1ca779   42423:
 202e98cb02dafa4e7ee0b9791c671c2ba93b3bc5   42415:
 2261d9e7d86bf61163e01a1291c12faec4785edb   42399:
 73c665adf2309941ca1548e02cfcf070c3512517   42367:
 3c5adf12a7a027385d9aee9ca362c87304c12bf5 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/scsi/ips.h | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 622b082746a2..9cf2433dd340 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5f82ab8342b527231cfcccde1fe265666e86b7b
+refs/heads/master: 297295ae6653af1356dd35a8edc411e2715aec57
diff --git a/trunk/drivers/scsi/ips.h b/trunk/drivers/scsi/ips.h
index 34680f3dd452..b726dcc424b1 100644
--- a/trunk/drivers/scsi/ips.h
+++ b/trunk/drivers/scsi/ips.h
@@ -51,6 +51,7 @@
    #define _IPS_H_
 
 #include <linux/version.h>
+#include <linux/nmi.h>
    #include <asm/uaccess.h>
    #include <asm/io.h>
 
@@ -116,9 +117,11 @@
             dev_printk(level , &((pcidev)->dev) , format , ## arg)
    #endif
 
-   #ifndef MDELAY
-      #define MDELAY mdelay
-   #endif
+   #define MDELAY(n)			\
+	do {				\
+		mdelay(n);		\
+		touch_nmi_watchdog();	\
+	} while (0)
 
    #ifndef min
       #define min(x,y) ((x) < (y) ? x : y)