Merge branch 'irqchip/mvebu' into irqchip/core

2015-04-02 23:27:10 +00:00 · 2015-04-02 23:27:10 +00:00 · 2a6c0f0ad5
commit 2a6c0f0ad5
parent fa6ed4cb6f 0d8e1d80bb
1 changed files with 1 additions and 0 deletions
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@ -295,6 +295,7 @@ static struct irq_chip armada_370_xp_irq_chip = {
 #ifdef CONFIG_SMP
 	.irq_set_affinity = armada_xp_set_affinity,
 #endif
+	.flags		= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND,
 };

 static int armada_370_xp_mpic_irq_map(struct irq_domain *h,