@@ -24,10 +24,12 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/io.h>
-#include <mach/r8a7740.h>
+
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+
#include "common.h"
+#include "r8a7740.h"
/*
* CON1 Camera Module
@@ -45,7 +45,7 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <linux/reboot.h>
-#include <mach/r8a7740.h>
+
#include <media/mt9t112.h>
#include <media/sh_mobile_ceu.h>
#include <media/soc_camera.h>
@@ -59,9 +59,11 @@
#include <video/sh_mobile_hdmi.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
+
#include "common.h"
#include "irqs.h"
#include "pm-rmobile.h"
+#include "r8a7740.h"
#include "sh-gpio.h"
/*
@@ -22,9 +22,10 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r8a7740.h>
+
#include "clock.h"
#include "common.h"
+#include "r8a7740.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7740.h
rename to arch/arm/mach-shmobile/r8a7740.h
@@ -31,15 +31,17 @@
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/r8a7740.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 "pm-rmobile.h"
+#include "r8a7740.h"
static struct map_desc r8a7740_io_desc[] __initdata = {
/*
Change location of r8a7740.h so it can be included as "r8a7740.h" instead of the old style <mach/r8a7740.h> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 +++- arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +++- arch/arm/mach-shmobile/clock-r8a7740.c | 3 ++- arch/arm/mach-shmobile/{include/mach => }/r8a7740.h | 0 arch/arm/mach-shmobile/setup-r8a7740.c | 4 +++- 5 files changed, 11 insertions(+), 4 deletions(-) rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (100%)