diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 10:32:39 +0100 |
|---|---|---|
| committer | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 10:32:39 +0100 |
| commit | 1f52299ec000e2161635b263d81ab92ea7f1f0a7 (patch) | |
| tree | 66b1414ce81dacf5758e824640f869d16d024c4a /arch/mips/include/asm/irq.h | |
| parent | ffd76d8be36da09f8456c55569c008f5aa93095e (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
| download | linux-1f52299ec000e2161635b263d81ab92ea7f1f0a7.tar.bz2 | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6 into for_3.4/dt_irq_domain2
Diffstat (limited to 'arch/mips/include/asm/irq.h')
| -rw-r--r-- | arch/mips/include/asm/irq.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index 2354c870a63a..fb698dc09bc9 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h @@ -11,15 +11,12 @@ #include <linux/linkage.h> #include <linux/smp.h> +#include <linux/irqdomain.h> #include <asm/mipsmtregs.h> #include <irq.h> -static inline void irq_dispose_mapping(unsigned int virq) -{ -} - #ifdef CONFIG_I8259 static inline int irq_canonicalize(int irq) { |