| From c98a0bd5cecc1637ebc100a3b9fc1106aa6358b4 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Tue, 17 Jun 2014 16:47:13 +0900 |
| Subject: ARM: shmobile: Move dma-register.h |
| |
| Change location of dma-register.h so it can be used as #include |
| "dma-register.h" instead of the old style #include <mach/dma-register.h>. |
| |
| Signed-off-by: Magnus Damm <damm+renesas@opensource.se> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 74ac0de8b7ee41246b8d6aae1df0618a64451435) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/{include/mach => }/dma-register.h | 0 |
| arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7790.c | 2 +- |
| arch/arm/mach-shmobile/setup-sh7372.c | 2 +- |
| arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- |
| 6 files changed, 5 insertions(+), 5 deletions(-) |
| rename arch/arm/mach-shmobile/{include/mach => }/dma-register.h (100%) |
| |
| diff --git a/arch/arm/mach-shmobile/include/mach/dma-register.h b/arch/arm/mach-shmobile/dma-register.h |
| similarity index 100% |
| rename from arch/arm/mach-shmobile/include/mach/dma-register.h |
| rename to arch/arm/mach-shmobile/dma-register.h |
| diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| index 9333770cfac2..985739e1885d 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a73a4.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| @@ -25,10 +25,10 @@ |
| #include <linux/sh_dma.h> |
| #include <linux/sh_timer.h> |
| #include <mach/common.h> |
| -#include <mach/dma-register.h> |
| #include <mach/irqs.h> |
| #include <mach/r8a73a4.h> |
| #include <asm/mach/arch.h> |
| +#include "dma-register.h" |
| |
| static const struct resource pfc_resources[] = { |
| DEFINE_RES_MEM(0xe6050000, 0x9000), |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c |
| index 35dec233301e..7cf4bbd90aa8 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7740.c |
| @@ -31,7 +31,6 @@ |
| #include <linux/sh_dma.h> |
| #include <linux/sh_timer.h> |
| #include <linux/platform_data/sh_ipmmu.h> |
| -#include <mach/dma-register.h> |
| #include <mach/r8a7740.h> |
| #include <mach/pm-rmobile.h> |
| #include <mach/common.h> |
| @@ -40,6 +39,7 @@ |
| #include <asm/mach/map.h> |
| #include <asm/mach/arch.h> |
| #include <asm/mach/time.h> |
| +#include "dma-register.h" |
| |
| static struct map_desc r8a7740_io_desc[] __initdata = { |
| /* |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c |
| index 6bd08b127fa4..3eed62673bf4 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7790.c |
| @@ -27,10 +27,10 @@ |
| #include <linux/sh_dma.h> |
| #include <linux/sh_timer.h> |
| #include <mach/common.h> |
| -#include <mach/dma-register.h> |
| #include <mach/irqs.h> |
| #include <mach/r8a7790.h> |
| #include <asm/mach/arch.h> |
| +#include "dma-register.h" |
| |
| /* Audio-DMAC */ |
| #define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \ |
| diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c |
| index 3b23ced2eb55..062929b303f7 100644 |
| --- a/arch/arm/mach-shmobile/setup-sh7372.c |
| +++ b/arch/arm/mach-shmobile/setup-sh7372.c |
| @@ -33,7 +33,6 @@ |
| #include <linux/pm_domain.h> |
| #include <linux/dma-mapping.h> |
| #include <linux/platform_data/sh_ipmmu.h> |
| -#include <mach/dma-register.h> |
| #include <mach/irqs.h> |
| #include <mach/sh7372.h> |
| #include <mach/common.h> |
| @@ -41,6 +40,7 @@ |
| #include <asm/mach-types.h> |
| #include <asm/mach/arch.h> |
| #include <asm/mach/time.h> |
| +#include "dma-register.h" |
| |
| static struct map_desc sh7372_io_desc[] __initdata = { |
| /* create a 1:1 entity map for 0xe6xxxxxx |
| diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c |
| index a758d2adca31..370d55c400e8 100644 |
| --- a/arch/arm/mach-shmobile/setup-sh73a0.c |
| +++ b/arch/arm/mach-shmobile/setup-sh73a0.c |
| @@ -32,7 +32,6 @@ |
| #include <linux/sh_timer.h> |
| #include <linux/platform_data/sh_ipmmu.h> |
| #include <linux/platform_data/irq-renesas-intc-irqpin.h> |
| -#include <mach/dma-register.h> |
| #include <mach/irqs.h> |
| #include <mach/sh73a0.h> |
| #include <mach/common.h> |
| @@ -40,6 +39,7 @@ |
| #include <asm/mach/map.h> |
| #include <asm/mach/arch.h> |
| #include <asm/mach/time.h> |
| +#include "dma-register.h" |
| |
| static struct map_desc sh73a0_io_desc[] __initdata = { |
| /* create a 1:1 entity map for 0xe6xxxxxx |
| -- |
| 2.1.2 |
| |