diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:05:29 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:05:29 -0800 |
| commit | 4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch) | |
| tree | feb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/mach-imx/gpc.c | |
| parent | 37a42fca282cb37c14d997ca9299bdc6617815bb (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
| download | talos-obmc-linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.gz talos-obmc-linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.zip | |
Merge branch 'irqchip/gic-vic-move' into next/virt
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 |
