From: Tony Lindgren <tony@atomide.com>
Date: Mon, 4 Jun 2012 09:09:45 +0000 (-0700)
Subject: Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~2597^2~3^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4564747649db987722aa781280eb8325c6a5a1a8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for_3.5/fixes/pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes
---

4564747649db987722aa781280eb8325c6a5a1a8
diff --cc arch/arm/mach-omap2/irq.c
index fdc4303be563,b0790a995dc9..6038a8c84b74
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@@ -149,7 -148,9 +149,8 @@@ omap_alloc_gc(void __iomem *base, unsig
  	ct->chip.irq_ack = omap_mask_ack_irq;
  	ct->chip.irq_mask = irq_gc_mask_disable_reg;
  	ct->chip.irq_unmask = irq_gc_unmask_enable_reg;
+ 	ct->chip.flags |= IRQCHIP_SKIP_SET_WAKE;
  
 -	ct->regs.ack = INTC_CONTROL;
  	ct->regs.enable = INTC_MIR_CLEAR0;
  	ct->regs.disable = INTC_MIR_SET0;
  	irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,