diff options
| author | Linus Torvalds | 2014-03-08 01:31:41 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-08 01:31:41 +0100 |
| commit | 27ea0f781198a9c594b036abf406b65a4705d5f2 (patch) | |
| tree | 8f0face03e98b8b99d0286db4dac842ea117743f /kernel/irq/irqdomain.c | |
| parent | Merge tag 'dm-3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | genirq: Include missing header file in irqdomain.c (diff) | |
| download | kernel-qcow2-linux-27ea0f781198a9c594b036abf406b65a4705d5f2.tar.gz kernel-qcow2-linux-27ea0f781198a9c594b036abf406b65a4705d5f2.tar.xz kernel-qcow2-linux-27ea0f781198a9c594b036abf406b65a4705d5f2.zip | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
- a bugfix for a long standing waitqueue race
- a trivial fix for a missing include
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Include missing header file in irqdomain.c
genirq: Remove racy waitqueue_active check
Diffstat (limited to 'kernel/irq/irqdomain.c')
| -rw-r--r-- | kernel/irq/irqdomain.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index cf68bb36fe58..f14033700c25 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -10,6 +10,7 @@ #include <linux/mutex.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_irq.h> #include <linux/topology.h> #include <linux/seq_file.h> #include <linux/slab.h> |