projects / platform / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 87c5257)
[ARM] give RiscPC a NR_IRQS definition and remove default
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 29 Nov 2008 19:14:31 +0000 (19:14 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 29 Nov 2008 19:14:31 +0000 (19:14 +0000)
RiscPC is the only platform using the default setting for NR_IRQS,
so the default NR_IRQS doesn't really make sense; remove it and
make RiscPC provide such a definition.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/include/asm/irq.h patch | blob | history
arch/arm/mach-rpc/include/mach/irqs.h patch | blob | history

diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
index a0009aa..328f14a 100644 (file)
--- a/arch/arm/include/asm/irq.h
+++ b/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/arch/arm/mach-rpc/include/mach/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h
index 4ce6ca9..3d20374 100644 (file)
--- a/arch/arm/mach-rpc/include/mach/irqs.h
+++ b/arch/arm/mach-rpc/include/mach/irqs.h
@@ -44,3 +44,4 @@
 
 #define IRQ_TIMER              IRQ_TIMER0
 
+#define NR_IRQS                        128
Domain: System / Uncategorized;