diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 20:43:40 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 20:43:40 +0400 |
| commit | e1ddcdef841f68d175b1a4a5c91d55f383ce5241 (patch) | |
| tree | 69122e47ea903b99c5e7a6c871deb7717663bf5f /arch/arm/mach-shmobile/board-bockw-reference.c | |
| parent | edf4f16f2709abcce37f10ac0c64d06d540ed6b2 (diff) | |
| parent | 113522ee3034427472bcb4b8665833719809b31a (diff) | |
| download | linux-e1ddcdef841f68d175b1a4a5c91d55f383ce5241.tar.xz | |
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/board-bockw-reference.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-bockw-reference.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c index 91ff3a27ccc7..ba840cd333b9 100644 --- a/arch/arm/mach-shmobile/board-bockw-reference.c +++ b/arch/arm/mach-shmobile/board-bockw-reference.c @@ -19,9 +19,11 @@ */ #include <linux/of_platform.h> -#include <mach/r8a7778.h> + #include <asm/mach/arch.h> + #include "common.h" +#include "r8a7778.h" /* * see board-bock.c for checking detail of dip-switch |