diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-04 05:09:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-04 05:09:45 -0400 |
| commit | 4564747649db987722aa781280eb8325c6a5a1a8 (patch) | |
| tree | c75bd92f4c6a59e9873088f1e5357cd3242977cd /arch/arm/mach-omap2/irq.c | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
| parent | 1ce029968718477149e7f1fb245a8e82c690cc4a (diff) | |
Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index fdc4303be563..6038a8c84b74 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -149,6 +149,7 @@ omap_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) | |||
| 149 | ct->chip.irq_ack = omap_mask_ack_irq; | 149 | ct->chip.irq_ack = omap_mask_ack_irq; |
| 150 | ct->chip.irq_mask = irq_gc_mask_disable_reg; | 150 | ct->chip.irq_mask = irq_gc_mask_disable_reg; |
| 151 | ct->chip.irq_unmask = irq_gc_unmask_enable_reg; | 151 | ct->chip.irq_unmask = irq_gc_unmask_enable_reg; |
| 152 | ct->chip.flags |= IRQCHIP_SKIP_SET_WAKE; | ||
| 152 | 153 | ||
| 153 | ct->regs.enable = INTC_MIR_CLEAR0; | 154 | ct->regs.enable = INTC_MIR_CLEAR0; |
| 154 | ct->regs.disable = INTC_MIR_SET0; | 155 | ct->regs.disable = INTC_MIR_SET0; |