[PATCH 3/9] ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
Tony Lindgren
tony at atomide.com
Thu Aug 30 20:52:26 EDT 2012
Make INTCPS_NR_IRQS local for mach-omap2/irq.c
Signed-off-by: Tony Lindgren <tony at atomide.com>
---
arch/arm/mach-omap2/irq.c | 2 ++
arch/arm/plat-omap/include/plat/irqs.h | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index bcd83db..ac59f96 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -49,6 +49,8 @@
#define OMAP3_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)
#define INTCPS_SIR_IRQ_OFFSET 0x0040 /* omap2/3 active interrupt offset */
#define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */
+#define INTCPS_NR_MIR_REGS 3
+#define INTCPS_NR_IRQS 96
/*
* OMAP2 has a number of different interrupt controllers, each interrupt
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
index 15f497c..fc3959c 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -440,9 +440,6 @@
#define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))
-#define INTCPS_NR_MIR_REGS 3
-#define INTCPS_NR_IRQS 96
-
#include <mach/hardware.h>
#ifdef CONFIG_FIQ
More information about the linux-arm-kernel
mailing list