diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-05 02:40:36 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-05 02:40:36 +0400 |
| commit | 314864b5a538c5ec1f871d814974edc37bdc676e (patch) | |
| tree | f0d341e6eae1cd5c4ca6180aeb29a00e21ff8a8e /arch/arm/plat-samsung/irq-vic-timer.c | |
| parent | e5f042c6edebec55bb20a5e399f892766ac65411 (diff) | |
| parent | 8417d689429075fe59d92af4036e25424b13ea9c (diff) | |
Merge branch 'tracking-integration-linux-vexpress' into merge-linux-linaro-lsklsk-20130505.0
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 f980cf3d2baa..5d205e74e495 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); |