projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 06413f1)
ARM: vexpress: remove dependency on mach/* headers
authorArnd Bergmann <arnd@arndb.de>
Mon, 7 May 2012 16:54:40 +0000 (16:54 +0000)
committerRob Herring <rob.herring@calxeda.com>
Fri, 14 Sep 2012 14:22:05 +0000 (09:22 -0500)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Pawel Moll <pawel.moll@arm.com>
arch/arm/mach-vexpress/ct-ca9x4.c patch | blob | history
arch/arm/mach-vexpress/include/mach/irqs.h patch | blob | history

diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 61c492403b05f46957787a7836ef12a0eee44695..0e770e89fb9c9e82234fa773d03a3fe3e8e3af77 100644 (file)
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -27,6 +27,7 @@
 #include "core.h"
 
 #include <mach/motherboard.h>
+#include <mach/irqs.h>
 
 #include <plat/clcd.h>
 
diff --git a/arch/arm/mach-vexpress/include/mach/irqs.h b/arch/arm/mach-vexpress/include/mach/irqs.h
index 4b10ee7657a66f463626170165ef8903788410bf..f8f7f782eb5554016e3cdfc5057688957ccb7de3 100644 (file)
--- a/arch/arm/mach-vexpress/include/mach/irqs.h
+++ b/arch/arm/mach-vexpress/include/mach/irqs.h
@@ -1,4 +1,6 @@
 #define IRQ_LOCALTIMER         29
 #define IRQ_LOCALWDOG          30
 
+#ifndef CONFIG_SPARSE_IRQ
 #define NR_IRQS        256
+#endif
John Crispins staging tree