Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / include / asm-s390 / irq.h

diff --git a/include/asm-s390/irq.h b/include/asm-s390/irq.h
index bd1a721f7aa2e82f1da34afb8d7f7771e260033c..7da991a858f8c97f1f390fd8285ebb3ab9e3c592 100644 (file)
--- a/include/asm-s390/irq.h
+++ b/include/asm-s390/irq.h
@@ -19,8 +19,5 @@ enum interruption_class {
        NR_IRQS,
 };
 
-#define touch_nmi_watchdog() do { } while(0)
-
 #endif /* __KERNEL__ */
 #endif
-