diff options
author | 2013-02-21 17:07:14 +0100 | |
---|---|---|
committer | 2013-02-21 17:07:14 +0100 | |
commit | e29371d762df5bb35d2bc434ea266a046e5a0a75 (patch) | |
tree | dac4a8db52d92453415f35606130a49e9f32e4ef /arch/mips/include/asm/mach-netlogic/irq.h | |
parent | netfilter: ipset: Fix range bug in hash:ip,port,net (diff) | |
parent | netfilter: nf_ct_reasm: fix per-netns sysctl initialization (diff) | |
download | linux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.tar.xz linux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.zip |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'arch/mips/include/asm/mach-netlogic/irq.h')
-rw-r--r-- | arch/mips/include/asm/mach-netlogic/irq.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-netlogic/irq.h b/arch/mips/include/asm/mach-netlogic/irq.h index b5902458e7c1..868ed8a2ed5c 100644 --- a/arch/mips/include/asm/mach-netlogic/irq.h +++ b/arch/mips/include/asm/mach-netlogic/irq.h @@ -8,7 +8,9 @@ #ifndef __ASM_NETLOGIC_IRQ_H #define __ASM_NETLOGIC_IRQ_H -#define NR_IRQS 64 +#include <asm/mach-netlogic/multi-node.h> +#define NR_IRQS (64 * NLM_NR_NODES) + #define MIPS_CPU_IRQ_BASE 0 #endif /* __ASM_NETLOGIC_IRQ_H */ |