Merge branch 'irqchip/mvebu' into irqchip/core

2a6c0f0a · Jason Cooper · fa6ed4cb · 0d8e1d80 · 2a6c0f0a
Commit 2a6c0f0a authored Apr 02, 2015 by Jason Cooper
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/irqchip/irq-armada-370-xp.c drivers/irqchip/irq-armada-370-xp.c +1 -0

No files found.
--- 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,