Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326508
b: refs/heads/master
c: 3003ce3
h: refs/heads/master
v: v3
  • Loading branch information
Tony Lindgren committed Sep 13, 2012
1 parent c312af1 commit 3b4a880
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 936e0f2fd64efbb28444c916814b6232dddac03b
refs/heads/master: 3003ce3ecd31b171a99d3693ee89f4640a000e13
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-omap2/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions trunk/arch/arm/plat-omap/include/plat/irqs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3b4a880

Please sign in to comment.