| From 864a98221a7182b7ddc5e0ac3e93c7da23f921ef Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 20 Jun 2014 18:53:02 +0200 |
| Subject: ARM: shmobile: Move r8a73a4.h |
| |
| 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> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit fac49568b0d19e039e216ca6d13bc534ebf12c34) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| 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%) |
| |
| diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c |
| index 76e4ff14be68..2f7723e5fe91 100644 |
| --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c |
| +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c |
| @@ -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) |
| { |
| diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c |
| index 8f8da25310e7..485567876d39 100644 |
| --- a/arch/arm/mach-shmobile/board-ape6evm.c |
| +++ b/arch/arm/mach-shmobile/board-ape6evm.c |
| @@ -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[] = { |
| diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h |
| similarity index 100% |
| rename from arch/arm/mach-shmobile/include/mach/r8a73a4.h |
| rename to arch/arm/mach-shmobile/r8a73a4.h |
| diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| index da94d9b9292e..f470b3cc0b7b 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a73a4.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| @@ -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), |
| -- |
| 2.1.2 |
| |