diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-06-20 18:53:08 +0200 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-25 16:50:00 +0900 |
commit | 113522ee3034427472bcb4b8665833719809b31a (patch) | |
tree | 156c8fc3bab8416f7c8d9bb80e717f6e6552135a | |
parent | ded59d6dfc47683d1b810c069ed637e1e60e75fd (diff) | |
download | op-kernel-dev-113522ee3034427472bcb4b8665833719809b31a.zip op-kernel-dev-113522ee3034427472bcb4b8665833719809b31a.tar.gz |
ARM: shmobile: Move sh7372.h
Change location of sh7372.h so it can be included as "sh7372.h"
instead of the old style <mach/sh7372.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/pm-sh7372.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-sh7372.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/sh7372.h (renamed from arch/arm/mach-shmobile/include/mach/sh7372.h) | 0 |
4 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 0ece865..304b76f 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -51,6 +51,7 @@ #include <linux/tca6416_keypad.h> #include <linux/usb/renesas_usbhs.h> #include <linux/dma-mapping.h> + #include <video/sh_mobile_hdmi.h> #include <video/sh_mobile_lcdc.h> #include <media/sh_mobile_ceu.h> @@ -58,13 +59,14 @@ #include <media/soc_camera_platform.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> -#include <mach/sh7372.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> + #include "common.h" #include "irqs.h" #include "pm-rmobile.h" #include "sh-gpio.h" +#include "sh7372.h" /* * Address Interface BusWidth note diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 7ef9a01..7e5c267 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c @@ -21,13 +21,15 @@ #include <linux/irq.h> #include <linux/bitrev.h> #include <linux/console.h> + #include <asm/cpuidle.h> #include <asm/io.h> #include <asm/tlbflush.h> #include <asm/suspend.h> -#include <mach/sh7372.h> + #include "common.h" #include "pm-rmobile.h" +#include "sh7372.h" /* DBG */ #define DBGREG1 IOMEM(0xe6100020) diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index 5571f86..9cdfcdf 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c @@ -33,15 +33,17 @@ #include <linux/pm_domain.h> #include <linux/dma-mapping.h> #include <linux/platform_data/sh_ipmmu.h> -#include <mach/sh7372.h> + #include <asm/mach/map.h> #include <asm/mach-types.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 "sh7372.h" static struct map_desc sh7372_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/sh7372.h index 4ad960d..4ad960d 100644 --- a/arch/arm/mach-shmobile/include/mach/sh7372.h +++ b/arch/arm/mach-shmobile/sh7372.h |