diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-02 19:27:10 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-02 19:27:10 -0400 |
| commit | 2a6c0f0ad5c0127d18b43674bd94785fae2ef5fe (patch) | |
| tree | f7ef6dc6ad3f3281c0cb61d4cd477fe4f5c31604 /drivers/irqchip | |
| parent | fa6ed4cb6fd44ef4c6fad4d9572119d22381f32c (diff) | |
| parent | 0d8e1d80bbe9852f42784072880df002534c6e0f (diff) | |
Merge branch 'irqchip/mvebu' into irqchip/core
Diffstat (limited to 'drivers/irqchip')
| -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 = { | |||
| 295 | #ifdef CONFIG_SMP | 295 | #ifdef CONFIG_SMP |
| 296 | .irq_set_affinity = armada_xp_set_affinity, | 296 | .irq_set_affinity = armada_xp_set_affinity, |
| 297 | #endif | 297 | #endif |
| 298 | .flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND, | ||
| 298 | }; | 299 | }; |
| 299 | 300 | ||
| 300 | static int armada_370_xp_mpic_irq_map(struct irq_domain *h, | 301 | static int armada_370_xp_mpic_irq_map(struct irq_domain *h, |