diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:27 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:27 -0800 |
commit | 440f39a4fda5d80f290e32f67bd084b63a41a436 (patch) | |
tree | 913be35b58a374ad3757e937e5f2b23486bb9dd4 /arch/arm/mach-shmobile/intc-sh73a0.c | |
parent | 7734a93bf7553042a339748dad6e4961d94cfa28 (diff) | |
parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
download | linux-440f39a4fda5d80f290e32f67bd084b63a41a436.tar.bz2 |
Merge branch 'depends/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-shmobile/intc-sh73a0.c')
-rw-r--r-- | arch/arm/mach-shmobile/intc-sh73a0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c index f0c5e5190601..978369973be4 100644 --- a/arch/arm/mach-shmobile/intc-sh73a0.c +++ b/arch/arm/mach-shmobile/intc-sh73a0.c @@ -23,10 +23,10 @@ #include <linux/irq.h> #include <linux/io.h> #include <linux/sh_intc.h> +#include <linux/irqchip/arm-gic.h> #include <mach/intc.h> #include <mach/irqs.h> #include <mach/sh73a0.h> -#include <asm/hardware/gic.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> |