From a6c957dcd4b991e25cba5360e3b6b44a7a2fc580 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Tue, 3 Jan 2012 15:17:23 -0600
Subject: [PATCH] --- yaml --- r: 297620 b: refs/heads/master c:
 a2be01b15443d5bc45d23b970dab0abba773ef2a h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/include/asm/irq.h | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b8a2aef584d..689be4c42781 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 250a27237e0e0694f8f8451594a0f03e0a4f5a73
+refs/heads/master: a2be01b15443d5bc45d23b970dab0abba773ef2a
diff --git a/trunk/arch/arm/include/asm/irq.h b/trunk/arch/arm/include/asm/irq.h
index 5a526afb5f18..35c21c375d81 100644
--- a/trunk/arch/arm/include/asm/irq.h
+++ b/trunk/arch/arm/include/asm/irq.h
@@ -1,14 +1,18 @@
 #ifndef __ASM_ARM_IRQ_H
 #define __ASM_ARM_IRQ_H
 
+#define NR_IRQS_LEGACY	16
+
+#ifndef CONFIG_SPARSE_IRQ
 #include <mach/irqs.h>
+#else
+#define NR_IRQS NR_IRQS_LEGACY
+#endif
 
 #ifndef irq_canonicalize
 #define irq_canonicalize(i)	(i)
 #endif
 
-#define NR_IRQS_LEGACY	16
-
 /*
  * Use this value to indicate lack of interrupt
  * capability