@@ -23,11 +23,13 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
/* DU */
@@ -45,11 +45,13 @@
#include <linux/spi/flash.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
/* DU */
@@ -10,10 +10,12 @@
* for more details.
*/
-#include <asm/io.h>
#include <linux/kernel.h>
-#include <mach/r8a7791.h>
+
+#include <asm/io.h>
+
#include "pm-rcar.h"
+#include "r8a7791.h"
/* SYSC */
#define SYSCIER 0x0c
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7791.h
rename to arch/arm/mach-shmobile/r8a7791.h
@@ -26,10 +26,12 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
static const struct resource pfc_resources[] __initconst = {
@@ -17,9 +17,11 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/io.h>
+
#include <asm/smp_plat.h>
-#include <mach/r8a7791.h>
+
#include "common.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
#define RST 0xe6160000
Change location of r8a7791.h so it can be included as "r8a7791.h" instead of the old style <mach/r8a7791.h> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/board-koelsch-reference.c | 4 +++- arch/arm/mach-shmobile/board-koelsch.c | 4 +++- arch/arm/mach-shmobile/pm-r8a7791.c | 6 ++++-- arch/arm/mach-shmobile/{include/mach => }/r8a7791.h | 0 arch/arm/mach-shmobile/setup-r8a7791.c | 4 +++- arch/arm/mach-shmobile/smp-r8a7791.c | 4 +++- 6 files changed, 16 insertions(+), 6 deletions(-) rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (100%)