@@ -20,11 +20,13 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
+#include "r7s72100.h"
/*
* This is a really crude hack to provide clkdev support to platform
@@ -25,11 +25,13 @@
#include <linux/sh_eth.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r7s72100.h"
/* Ether */
static const struct sh_eth_plat_data ether_pdata __initconst = {
@@ -19,8 +19,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r7s72100.h>
+
#include "common.h"
+#include "r7s72100.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r7s72100.h
rename to arch/arm/mach-shmobile/r7s72100.h
@@ -22,10 +22,12 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/sh_timer.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r7s72100.h"
static struct resource mtu2_resources[] __initdata = {
DEFINE_RES_MEM(0xfcff0000, 0x400),
Change location of r7s72100.h so it can be included using "r7s72100.h" instead of the old style <mach/r7s72100.h>. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/board-genmai-reference.c | 4 +++- arch/arm/mach-shmobile/board-genmai.c | 4 +++- arch/arm/mach-shmobile/clock-r7s72100.c | 3 ++- arch/arm/mach-shmobile/{include/mach => }/r7s72100.h | 0 arch/arm/mach-shmobile/setup-r7s72100.c | 4 +++- 5 files changed, 11 insertions(+), 4 deletions(-) rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (100%)