Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-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 916a1aa0b07302f8100ca87b4fd8b3b8461cedc8..7da991a858f8c97f1f390fd8285ebb3ab9e3c592 100644 (file)
--- a/include/asm-s390/irq.h
+++ b/include/asm-s390/irq.h
@@ -19,12 +19,5 @@ enum interruption_class {
        NR_IRQS,
 };
 
-#define touch_nmi_watchdog() do { } while(0)
-
-struct irqaction;
-struct pt_regs;
-int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
-
 #endif /* __KERNEL__ */
 #endif
-