Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[karo-tx-linux.git] / include / asm-cris / irq.h

diff --git a/include/asm-cris/irq.h b/include/asm-cris/irq.h
index 8e787fdaedd41835db69807807278d953b337c34..4b338792218b045ce9593af9f5bac2329f686986 100644 (file)
--- a/include/asm-cris/irq.h
+++ b/include/asm-cris/irq.h
@@ -1,9 +1,14 @@
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
+/*
+ * IRQ line status macro IRQ_PER_CPU is used
+ */
+#define ARCH_HAS_IRQ_PER_CPU
+
 #include <asm/arch/irq.h>
 
-extern __inline__ int irq_canonicalize(int irq)
+static inline int irq_canonicalize(int irq)
 {  
   return irq; 
 }