diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 17:05:29 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 17:05:29 (GMT) |
| commit | 4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch) | |
| tree | feb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/mach-netx/generic.c | |
| parent | 37a42fca282cb37c14d997ca9299bdc6617815bb (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
| download | linux-fsl-qoriq-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.xz | |
Merge branch 'irqchip/gic-vic-move' into next/virt
Diffstat (limited to 'arch/arm/mach-netx/generic.c')
| -rw-r--r-- | arch/arm/mach-netx/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index aa62746..27c2cb7 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c @@ -23,9 +23,9 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/irqchip/arm-vic.h> #include <mach/hardware.h> #include <asm/mach/map.h> -#include <asm/hardware/vic.h> #include <mach/netx-regs.h> #include <asm/mach/irq.h> |