diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:33 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:33 +0100 |
| commit | e9bcea6f7eff94e886e3f6a1ef2c7010cd8bf89b (patch) | |
| tree | 5a73d4d392a1fe078b33e498e6fe2c68ead238cb /arch/arm/plat-samsung/irq-vic-timer.c | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
| parent | 9905bae08894b9c4af999ee4658c3e68455b98bf (diff) | |
Merge branch 'tracking-armlt-irqchip-reorg' into lsk-3.9-vexpress
Diffstat (limited to 'arch/arm/plat-samsung/irq-vic-timer.c')
| -rw-r--r-- | arch/arm/plat-samsung/irq-vic-timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/irq-vic-timer.c b/arch/arm/plat-samsung/irq-vic-timer.c index f980cf3d2ba..5d205e74e49 100644 --- a/arch/arm/plat-samsung/irq-vic-timer.c +++ b/arch/arm/plat-samsung/irq-vic-timer.c @@ -16,6 +16,7 @@ #include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/irq.h> +#include <linux/irqchip/chained_irq.h> #include <linux/io.h> #include <mach/map.h> @@ -23,8 +24,6 @@ #include <plat/irq-vic-timer.h> #include <plat/regs-timer.h> -#include <asm/mach/irq.h> - static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc) { struct irq_chip *chip = irq_get_chip(irq); |