@@ -24,10 +24,12 @@
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/sh_clk.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
+#include "r8a73a4.h"
static void __init ape6evm_add_standard_devices(void)
{
@@ -33,11 +33,13 @@
#include <linux/regulator/machine.h>
#include <linux/sh_clk.h>
#include <linux/smsc911x.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a73a4.h"
/* LEDS */
static struct gpio_led ape6evm_leds[] = {
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a73a4.h
rename to arch/arm/mach-shmobile/r8a73a4.h
@@ -24,11 +24,13 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
+#include "r8a73a4.h"
static const struct resource pfc_resources[] = {
DEFINE_RES_MEM(0xe6050000, 0x9000),
Change location of r8a73a4.h so it can be included as "r8a73a4.h" instead of the old style <mach/r8a73a4.h> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +++- arch/arm/mach-shmobile/board-ape6evm.c | 4 +++- arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0 arch/arm/mach-shmobile/setup-r8a73a4.c | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)