summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/include/mach/irqs.h
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-mmp/include/mach/irqs.h
parentdcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff)
parent72ee8499eb27f5724ac97b147350a5457a598aa3 (diff)
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/irqs.h')
-rw-r--r--arch/arm/mach-mmp/include/mach/irqs.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/include/mach/irqs.h b/arch/arm/mach-mmp/include/mach/irqs.h
index 34635a0bbb5..d0e746626a3 100644
--- a/arch/arm/mach-mmp/include/mach/irqs.h
+++ b/arch/arm/mach-mmp/include/mach/irqs.h
@@ -223,7 +223,6 @@
#define MMP_GPIO_TO_IRQ(gpio) (IRQ_GPIO_START + (gpio))
#define IRQ_BOARD_START (IRQ_GPIO_START + MMP_NR_BUILTIN_GPIO)
-
-#define NR_IRQS (IRQ_BOARD_START)
+#define MMP_NR_IRQS IRQ_BOARD_START
#endif /* __ASM_MACH_IRQS_H */