Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

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

diff --git a/include/asm-avr32/irq.h b/include/asm-avr32/irq.h
index 83e6549d7783f0ab2bff22b1a4a94f822ccb16e7..9315724c059675d7bdcda46007c63c9260afda7c 100644 (file)
--- a/include/asm-avr32/irq.h
+++ b/include/asm-avr32/irq.h
@@ -11,4 +11,9 @@
 
 #define irq_canonicalize(i)    (i)
 
+#ifndef __ASSEMBLER__
+int nmi_enable(void);
+void nmi_disable(void);
+#endif
+
 #endif /* __ASM_AVR32_IOCTLS_H */