diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 10:37:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 10:37:10 -0700 |
| commit | 8ac19f0d90f7de0e78b08770ba2eabd29ad2cb9e (patch) | |
| tree | 655ae8185fda26b7cc71d062665581ced9bca05c /drivers/irqchip/exynos-combiner.c | |
| parent | 1536340e7c67694b134cbbc07168e5a524e49d08 (diff) | |
| parent | 938c04a8708645ae335783ca630bbb806111802f (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull ARM irq chip fixes from Thomas Gleixner:
"Another pile of ARM specific irq chip fixlets:
- off by one bugs in the crossbar driver
- missing annotations
- a bunch of "make it compile" updates
I pulled the lot today from Jason, but it has been in -next for at
least a week"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: gic-v3: Declare rdist as __percpu pointer to __iomem pointer
irqchip: gic: Make gic_default_routable_irq_domain_ops static
irqchip: exynos-combiner: Fix compilation error on ARM64
irqchip: crossbar: Off by one bugs in init
irqchip: gic-v3: Tag all low level accessors __maybe_unused
irqchip: gic-v3: Only define gic_peek_irq() when building SMP
Diffstat (limited to 'drivers/irqchip/exynos-combiner.c')
| -rw-r--r-- | drivers/irqchip/exynos-combiner.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c index f8636a650cf6..5945223b73fa 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c @@ -15,6 +15,7 @@ #include <linux/slab.h> #include <linux/irqdomain.h> #include <linux/irqchip/chained_irq.h> +#include <linux/interrupt.h> #include <linux/of_address.h> #include <linux/of_irq.h> |