summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/smp-r8a7790.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-12 09:43:40 -0700
committerOlof Johansson <olof@lixom.net>2014-07-12 09:43:40 -0700
commite1ddcdef841f68d175b1a4a5c91d55f383ce5241 (patch)
tree69122e47ea903b99c5e7a6c871deb7717663bf5f /arch/arm/mach-shmobile/smp-r8a7790.c
parentedf4f16f2709abcce37f10ac0c64d06d540ed6b2 (diff)
parent113522ee3034427472bcb4b8665833719809b31a (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/smp-r8a7790.c')
-rw-r--r--arch/arm/mach-shmobile/smp-r8a7790.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c
index 7590e2b6e2fa..ad66beab2ea6 100644
--- a/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@ -17,10 +17,12 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/io.h>
+
#include <asm/smp_plat.h>
-#include <mach/r8a7790.h>
+
#include "common.h"
#include "pm-rcar.h"
+#include "r8a7790.h"
#define RST 0xe6160000
#define CA15BAR 0x0020