diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
| commit | 9f61f62544747db5d5c590bfae9dd19f1337e421 (patch) | |
| tree | 74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /kernel/irq | |
| parent | genirq: Set IRQCHIP_SKIP_SET_WAKE for no_irq_chip (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| download | linux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.xz linux-9f61f62544747db5d5c590bfae9dd19f1337e421.zip | |
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/dummychip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/dummychip.c b/kernel/irq/dummychip.c index 6a5419308c54..326a67f2410b 100644 --- a/kernel/irq/dummychip.c +++ b/kernel/irq/dummychip.c @@ -58,5 +58,6 @@ struct irq_chip dummy_irq_chip = { .irq_ack = noop, .irq_mask = noop, .irq_unmask = noop, + .flags = IRQCHIP_SKIP_SET_WAKE, }; EXPORT_SYMBOL_GPL(dummy_irq_chip); |