Merge branch 'irqchip/mvebu' into irqchip/core

mariux64 · Apr 2, 2015 · 2a6c0f0 · 2a6c0f0
2 parents fa6ed4c + 0d8e1d8
commit 2a6c0f0
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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,