From 486e478bb2cf5745ff2bdd247aefd016e28c4e3e Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 29 Nov 2008 19:14:31 +0000 Subject: [PATCH] --- yaml --- r: 123596 b: refs/heads/master c: 7577fdfa52438a19e7e8abedb6efc645986af2ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/irq.h | 4 ---- trunk/arch/arm/mach-rpc/include/mach/irqs.h | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 35eed267b896..783514e98ce2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87c52578bd050ba395b0cae7079b1128abd2422d +refs/heads/master: 7577fdfa52438a19e7e8abedb6efc645986af2ae diff --git a/trunk/arch/arm/include/asm/irq.h b/trunk/arch/arm/include/asm/irq.h index a0009aa5d157..328f14a8b790 100644 --- a/trunk/arch/arm/include/asm/irq.h +++ b/trunk/arch/arm/include/asm/irq.h @@ -7,10 +7,6 @@ #define irq_canonicalize(i) (i) #endif -#ifndef NR_IRQS -#define NR_IRQS 128 -#endif - /* * Use this value to indicate lack of interrupt * capability diff --git a/trunk/arch/arm/mach-rpc/include/mach/irqs.h b/trunk/arch/arm/mach-rpc/include/mach/irqs.h index 4ce6ca97f669..3d2037496e38 100644 --- a/trunk/arch/arm/mach-rpc/include/mach/irqs.h +++ b/trunk/arch/arm/mach-rpc/include/mach/irqs.h @@ -44,3 +44,4 @@ #define IRQ_TIMER IRQ_TIMER0 +#define NR_IRQS 128