From 7b49d05d79e6481593a40d1563028c87fe9b54dc Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 7 May 2012 16:54:40 +0000
Subject: [PATCH] --- yaml --- r: 327107 b: refs/heads/master c:
 db6b672f983eff887c8be0fb2ceee1c02d867dea h: refs/heads/master i:   327105:
 dcb86ccccffe5ac545033878b1cca68c596f41e8   327103:
 88dbcc53a3ea35f8fee2f998045200dd57a0d4b0 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/arm/mach-vexpress/ct-ca9x4.c          | 1 +
 trunk/arch/arm/mach-vexpress/include/mach/irqs.h | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4835fc7e23e4..ad9098ce5983 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06413f1e31b992b55bfd8a38346243ca80d621cd
+refs/heads/master: db6b672f983eff887c8be0fb2ceee1c02d867dea
diff --git a/trunk/arch/arm/mach-vexpress/ct-ca9x4.c b/trunk/arch/arm/mach-vexpress/ct-ca9x4.c
index 61c492403b05..0e770e89fb9c 100644
--- a/trunk/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/trunk/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/trunk/arch/arm/mach-vexpress/include/mach/irqs.h b/trunk/arch/arm/mach-vexpress/include/mach/irqs.h
index 4b10ee7657a6..f8f7f782eb55 100644
--- a/trunk/arch/arm/mach-vexpress/include/mach/irqs.h
+++ b/trunk/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