Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / mips / include / asm / irq.h

diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h
index dea4aed6478f7de6652c8b5491ebfc165cf52d53..b003ed52ed1725221ca6ac510251f46e7cb7d443 100644 (file)
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
@@ -16,6 +16,11 @@
 
 #include <irq.h>
 
+static inline void irq_dispose_mapping(unsigned int virq)
+{
+       return;
+}
+
 #ifdef CONFIG_I8259
 static inline int irq_canonicalize(int irq)
 {