diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-27 21:45:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-27 21:45:31 -0700 |
| commit | 0d36938bb82a7775c21ce0a7429f08ba13d025b6 (patch) | |
| tree | f502caf5555591ee237e14e5fa96b2c005a85036 /drivers/irqchip/irq-crossbar.c | |
| parent | 55f14da66954083b621debbdbf62c7fc429291e8 (diff) | |
| parent | 4941b8f0c2b9d88e8a6dacebf8b7faf603b98368 (diff) | |
| download | linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.gz linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.bz2 linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/irqchip/irq-crossbar.c')
| -rw-r--r-- | drivers/irqchip/irq-crossbar.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index 692fe2bc8197..c12bb93334ff 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -68,7 +68,9 @@ static struct irq_chip crossbar_chip = { .irq_mask = irq_chip_mask_parent, .irq_unmask = irq_chip_unmask_parent, .irq_retrigger = irq_chip_retrigger_hierarchy, - .irq_set_wake = irq_chip_set_wake_parent, + .irq_set_type = irq_chip_set_type_parent, + .flags = IRQCHIP_MASK_ON_SUSPEND | + IRQCHIP_SKIP_SET_WAKE, #ifdef CONFIG_SMP .irq_set_affinity = irq_chip_set_affinity_parent, #endif |