summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-02-04 10:31:38 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-04 10:31:38 +0000
commitbea15fd77ffa1338c293328b8c74a120be53e861 (patch)
treebe8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-pxa/include
parentdcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff)
parent72ee8499eb27f5724ac97b147350a5457a598aa3 (diff)
downloadblackbird-op-linux-bea15fd77ffa1338c293328b8c74a120be53e861.tar.gz
blackbird-op-linux-bea15fd77ffa1338c293328b8c74a120be53e861.zip
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/include')
-rw-r--r--arch/arm/mach-pxa/include/mach/irqs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 32975adf3ca4..8765782dd955 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -100,7 +100,7 @@
*/
#define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_NR_BUILTIN_GPIO)
-#define NR_IRQS (IRQ_BOARD_START)
+#define PXA_NR_IRQS (IRQ_BOARD_START)
#ifndef __ASSEMBLY__
struct irq_data;
OpenPOWER on IntegriCloud