summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/board-marzen.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-06-20 16:53:05 (GMT)
committerSimon Horman <horms+renesas@verge.net.au>2014-06-25 07:52:39 (GMT)
commit1b55353c9214788b0d0797a5fd4585af1557a12c (patch)
treed6f2d2407874a685b151e0af56b755b78eb2c626 /arch/arm/mach-shmobile/board-marzen.c
parentc1a0f9932b66b2298163c31f8ac3f2844476e1c2 (diff)
downloadlinux-1b55353c9214788b0d0797a5fd4585af1557a12c.tar.xz
ARM: shmobile: Move r8a7779.h
Change location of r8a7779.h so it can be included as "r8a7779.h" instead of the old style <mach/r8a7779.h> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index fe445ef..25a1037 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -41,13 +41,15 @@
#include <linux/mmc/host.h>
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
+
#include <media/soc_camera.h>
-#include <mach/r8a7779.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/traps.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7779.h"
/* Fixed 3.3V regulator to be used by SDHI0 */
static struct regulator_consumer_supply fixed3v3_power_consumers[] = {