diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 12:03:36 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 12:03:36 +0000 |
| commit | 369e67595ad8f278edf32a65f10ba473baeff03e (patch) | |
| tree | a3bba5b97c6bb522343cf16a216047e9ca99d90c /arch/arm/plat-samsung/s5p-irq-eint.c | |
| parent | a749474de5f0f5902f59acb5c7f4dc6b816ac788 (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
| download | linux-369e67595ad8f278edf32a65f10ba473baeff03e.tar.gz | |
Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgic
Diffstat (limited to 'arch/arm/plat-samsung/s5p-irq-eint.c')
| -rw-r--r-- | arch/arm/plat-samsung/s5p-irq-eint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/s5p-irq-eint.c b/arch/arm/plat-samsung/s5p-irq-eint.c index 33bd3f3d20f5..faa651602780 100644 --- a/arch/arm/plat-samsung/s5p-irq-eint.c +++ b/arch/arm/plat-samsung/s5p-irq-eint.c @@ -15,8 +15,7 @@ #include <linux/io.h> #include <linux/device.h> #include <linux/gpio.h> - -#include <asm/hardware/vic.h> +#include <linux/irqchip/arm-vic.h> #include <plat/regs-irqtype.h> |