diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-04 17:43:29 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-12 18:06:30 -0700 |
| commit | 3003ce3ecd31b171a99d3693ee89f4640a000e13 (patch) | |
| tree | 81e4f8e00468ce66ac8c5f5ff15c93943fc015cf | |
| parent | 936e0f2fd64efbb28444c916814b6232dddac03b (diff) | |
| download | olio-linux-3.10-3003ce3ecd31b171a99d3693ee89f4640a000e13.tar.xz olio-linux-3.10-3003ce3ecd31b171a99d3693ee89f4640a000e13.zip | |
ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
Make INTCPS_NR_IRQS local for mach-omap2/irq.c
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 2 | ||||
| -rw-r--r-- | 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 bcd83db41bb..ac59f96a489 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 15f497c2602..fc3959cdac3 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 |