diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-03 01:27:10 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-03 01:27:10 +0200 |
| commit | 2a6c0f0ad5c0127d18b43674bd94785fae2ef5fe (patch) | |
| tree | f7ef6dc6ad3f3281c0cb61d4cd477fe4f5c31604 /drivers | |
| parent | irqchip: mips-gic: Add new functions to start/stop the GIC counter (diff) | |
| parent | irqchip: armada-370-xp: Allow using wakeup source (diff) | |
| download | linux-2a6c0f0ad5c0127d18b43674bd94785fae2ef5fe.tar.xz linux-2a6c0f0ad5c0127d18b43674bd94785fae2ef5fe.zip | |
Merge branch 'irqchip/mvebu' into irqchip/core
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 1 |
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, |