[SCSI] qla2xxx: Fail initialization when inconsistent NVRAM detected.

[linux-2.6-omap-h63xx.git] / drivers / scsi / ips.h

diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index 34680f3dd4523e10662aa03f6605478c2a72b262..b726dcc424b190f214d571a828339c125f28c6c4 100644 (file)
--- a/drivers/scsi/ips.h
+++ b/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)