diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-12 09:43:40 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-12 09:43:40 -0700 |
commit | e1ddcdef841f68d175b1a4a5c91d55f383ce5241 (patch) | |
tree | 69122e47ea903b99c5e7a6c871deb7717663bf5f /arch/arm/mach-shmobile/setup-sh73a0.c | |
parent | edf4f16f2709abcce37f10ac0c64d06d540ed6b2 (diff) | |
parent | 113522ee3034427472bcb4b8665833719809b31a (diff) |
Merge branch 'renesas/cleanup2' into next/soc
Merging in as base to resolve a merge conflict with later soc branch
locally.
Diffstat (limited to 'arch/arm/mach-shmobile/setup-sh73a0.c')
-rw-r--r-- | arch/arm/mach-shmobile/setup-sh73a0.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index b30bbee6dc65..224882151667 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -32,14 +32,16 @@ #include <linux/sh_timer.h> #include <linux/platform_data/sh_ipmmu.h> #include <linux/platform_data/irq-renesas-intc-irqpin.h> -#include <mach/sh73a0.h> + #include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> + #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "sh73a0.h" static struct map_desc sh73a0_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx |