summaryrefslogtreecommitdiff
path: root/kernel/irq/dummychip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-05 23:25:01 +0300
committerThomas Gleixner <tglx@linutronix.de>2015-06-05 23:25:01 +0300
commit9f61f62544747db5d5c590bfae9dd19f1337e421 (patch)
tree74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /kernel/irq/dummychip.c
parentde8d1810fda5463ee60ba2937ca68e55a52bd9e7 (diff)
parent086e8ddb567951513a5dace21a09297768aee14f (diff)
downloadlinux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.xz
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'kernel/irq/dummychip.c')
-rw-r--r--kernel/irq/dummychip.c1
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);