summaryrefslogtreecommitdiff
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2015-04-02 23:27:10 +0000
committerJason Cooper <jason@lakedaemon.net>2015-04-02 23:27:10 +0000
commit2a6c0f0ad5c0127d18b43674bd94785fae2ef5fe (patch)
treef7ef6dc6ad3f3281c0cb61d4cd477fe4f5c31604 /drivers/irqchip
parentfa6ed4cb6fd44ef4c6fad4d9572119d22381f32c (diff)
parent0d8e1d80bbe9852f42784072880df002534c6e0f (diff)
Merge branch 'irqchip/mvebu' into irqchip/core
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-armada-370-xp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index b36373c019ba..daccc8bdbb42 100644
--- 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,