Merge master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / include / asm-x86 / irq_32.h

diff --git a/include/asm-x86/irq_32.h b/include/asm-x86/irq_32.h
index 36f3106..0b79f31 100644 (file)
--- a/include/asm-x86/irq_32.h
+++ b/include/asm-x86/irq_32.h
@@ -15,7 +15,7 @@
 #include "irq_vectors.h"
 #include <asm/thread_info.h>
 
-static __inline__ int irq_canonicalize(int irq)
+static inline int irq_canonicalize(int irq)
 {
        return ((irq == 2) ? 9 : irq);
 }
@@ -45,4 +45,7 @@ unsigned int do_IRQ(struct pt_regs *regs);
 void init_IRQ(void);
 void __init native_init_IRQ(void);
 
+/* Interrupt vector management */
+extern DECLARE_BITMAP(used_vectors, NR_VECTORS);
+
 #endif /* _ASM_IRQ_H */