diff options
| -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 bcd83db41bbc..ac59f96a489f 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -49,6 +49,8 @@ | |||
| 49 | #define OMAP3_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE) | 49 | #define OMAP3_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE) |
| 50 | #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* omap2/3 active interrupt offset */ | 50 | #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* omap2/3 active interrupt offset */ |
| 51 | #define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */ | 51 | #define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */ |
| 52 | #define INTCPS_NR_MIR_REGS 3 | ||
| 53 | #define INTCPS_NR_IRQS 96 | ||
| 52 | 54 | ||
| 53 | /* | 55 | /* |
| 54 | * OMAP2 has a number of different interrupt controllers, each interrupt | 56 | * 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 15f497c2602e..fc3959cdac31 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h | |||
| @@ -440,9 +440,6 @@ | |||
| 440 | 440 | ||
| 441 | #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) | 441 | #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) |
| 442 | 442 | ||
| 443 | #define INTCPS_NR_MIR_REGS 3 | ||
| 444 | #define INTCPS_NR_IRQS 96 | ||
| 445 | |||
| 446 | #include <mach/hardware.h> | 443 | #include <mach/hardware.h> |
| 447 | 444 | ||
| 448 | #ifdef CONFIG_FIQ | 445 | #ifdef CONFIG_FIQ |
