diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-06-20 16:53:03 (GMT) |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-25 07:47:57 (GMT) |
| commit | 9e38b84b456ab7b2abd28257eec5caee4fb1f5ea (patch) | |
| tree | 11f4d8cf2ba0c3d6285e19757ee4b61c8160ce23 /arch | |
| parent | fac49568b0d19e039e216ca6d13bc534ebf12c34 (diff) | |
| download | linux-9e38b84b456ab7b2abd28257eec5caee4fb1f5ea.tar.xz | |
ARM: shmobile: Move r8a7740.h
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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7740.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/r8a7740.h (renamed from arch/arm/mach-shmobile/include/mach/r8a7740.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7740.c | 4 |
5 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index 368518b..2085766 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c @@ -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 diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 53d03e8..32339cf 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -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" /* diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c index ffefec5..789091c 100644 --- a/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/arch/arm/mach-shmobile/clock-r8a7740.c @@ -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 | diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h index 1d1a5fd..1d1a5fd 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7740.h +++ b/arch/arm/mach-shmobile/r8a7740.h diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 10170b3..348af35 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -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 = { /* |