diff options
author | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
---|---|---|
committer | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
commit | c646b0f4fdad4cc9dabdcbe40b5a893d173e2850 (patch) | |
tree | 246e0d7bc48137f2d176ad126cebd275a60b6833 /drivers/irqchip/exynos-combiner.c | |
parent | 4ce237b369eb9513c090d3c97e0c06c5a33f0cf7 (diff) | |
parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) |
Merge tag 'v3.17' into toradex_vf_3.17-next
Linux 3.17
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
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> |