x86: unify and correct the GDT_ENTRY() macro

[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 f7e725707dd7de5980a27943a1cc20ed315485b6..c563b7720c1ad7f8034100c64dd223e13e81d079 100644 (file)
--- a/include/asm-avr32/irq.h
+++ b/include/asm-avr32/irq.h
@@ -2,9 +2,23 @@
 #define __ASM_AVR32_IRQ_H
 
 #define NR_INTERNAL_IRQS       64
-#define NR_EXTERNAL_IRQS       64
-#define NR_IRQS                        (NR_INTERNAL_IRQS + NR_EXTERNAL_IRQS)
+
+#include <asm/arch/irq.h>
+
+#ifndef NR_IRQS
+#define NR_IRQS                        (NR_INTERNAL_IRQS)
+#endif
 
 #define irq_canonicalize(i)    (i)
 
+#ifndef __ASSEMBLER__
+int nmi_enable(void);
+void nmi_disable(void);
+
+/*
+ * Returns a bitmask of pending interrupts in a group.
+ */
+extern unsigned long intc_get_pending(unsigned int group);
+#endif
+
 #endif /* __ASM_AVR32_IOCTLS_H */