Merge branch 'master'

[linux-2.6] / include / asm-cris / irq.h

diff --git a/include/asm-cris/irq.h b/include/asm-cris/irq.h
index 4fab5c3b2e15ca4ee294346535d14456145c520e..4b338792218b045ce9593af9f5bac2329f686986 100644 (file)
--- a/include/asm-cris/irq.h
+++ b/include/asm-cris/irq.h
@@ -8,7 +8,7 @@
 
 #include <asm/arch/irq.h>
 
-extern __inline__ int irq_canonicalize(int irq)
+static inline int irq_canonicalize(int irq)
 {  
   return irq; 
 }