summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann2012-05-07 18:54:40 +0200
committerRob Herring2012-09-14 16:22:05 +0200
commitdb6b672f983eff887c8be0fb2ceee1c02d867dea (patch)
treea3ddd34815a81102515186779fc1270cf15430c5
parentARM: picoxcell: remove dependency on mach/* headers (diff)
downloadkernel-qcow2-linux-db6b672f983eff887c8be0fb2ceee1c02d867dea.tar.gz
kernel-qcow2-linux-db6b672f983eff887c8be0fb2ceee1c02d867dea.tar.xz
kernel-qcow2-linux-db6b672f983eff887c8be0fb2ceee1c02d867dea.zip
ARM: vexpress: remove dependency on mach/* headers
Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Pawel Moll <pawel.moll@arm.com>
-rw-r--r--arch/arm/mach-vexpress/ct-ca9x4.c1
-rw-r--r--arch/arm/mach-vexpress/include/mach/irqs.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 61c492403b05..0e770e89fb9c 100644
--- 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 4b10ee7657a6..f8f7f782eb55 100644
--- 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