diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 16:03:36 +0400 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 16:03:36 +0400 |
| commit | 369e67595ad8f278edf32a65f10ba473baeff03e (patch) | |
| tree | a3bba5b97c6bb522343cf16a216047e9ca99d90c /arch/arm/mach-imx/gpc.c | |
| parent | a749474de5f0f5902f59acb5c7f4dc6b816ac788 (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
| download | linux-369e67595ad8f278edf32a65f10ba473baeff03e.tar.xz | |
Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgic
Diffstat (limited to 'arch/arm/mach-imx/gpc.c')
| -rw-r--r-- | arch/arm/mach-imx/gpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index e1537f9e45b8..ff24920699e4 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -15,7 +15,7 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> -#include <asm/hardware/gic.h> +#include <linux/irqchip/arm-gic.h> #define GPC_IMR1 0x008 #define GPC_PGC_CPU_PDN 0x2a0 |