summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-12-02 01:31:53 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-12 17:38:38 +0100
commit17dd1094e49199c1b681e0dcd337547dbb2e3270 (patch)
tree34a8f639bd8d361e64acbce4e7264d5c3843f5e2
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff)
downloadlinux-3.10-17dd1094e49199c1b681e0dcd337547dbb2e3270.tar.gz
linux-3.10-17dd1094e49199c1b681e0dcd337547dbb2e3270.tar.bz2
linux-3.10-17dd1094e49199c1b681e0dcd337547dbb2e3270.zip
ARM: spear13xx: make mach/dma.h local
There is no reason for this header file to be globally visible, so let's just move it into the mach directory. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-rw-r--r--arch/arm/mach-spear13xx/spear1340.c3
-rw-r--r--arch/arm/mach-spear13xx/spear13xx-dma.h (renamed from arch/arm/mach-spear13xx/include/mach/dma.h)0
-rw-r--r--arch/arm/mach-spear13xx/spear13xx.c3
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-spear13xx/spear1340.c b/arch/arm/mach-spear13xx/spear1340.c
index 9a28beb2a11..b01c4c7009a 100644
--- a/arch/arm/mach-spear13xx/spear1340.c
+++ b/arch/arm/mach-spear13xx/spear1340.c
@@ -20,10 +20,11 @@
#include <linux/of_platform.h>
#include <linux/irqchip.h>
#include <asm/mach/arch.h>
-#include <mach/dma.h>
#include <mach/generic.h>
#include <mach/spear.h>
+#include "spear13xx-dma.h"
+
/* Base addresses */
#define SPEAR1340_SATA_BASE UL(0xB1000000)
#define SPEAR1340_UART1_BASE UL(0xB4100000)
diff --git a/arch/arm/mach-spear13xx/include/mach/dma.h b/arch/arm/mach-spear13xx/spear13xx-dma.h
index d50bdb60592..d50bdb60592 100644
--- a/arch/arm/mach-spear13xx/include/mach/dma.h
+++ b/arch/arm/mach-spear13xx/spear13xx-dma.h
diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c
index c7d2b4a8d8c..988fefebf81 100644
--- a/arch/arm/mach-spear13xx/spear13xx.c
+++ b/arch/arm/mach-spear13xx/spear13xx.c
@@ -21,10 +21,11 @@
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/map.h>
#include <asm/smp_twd.h>
-#include <mach/dma.h>
#include <mach/generic.h>
#include <mach/spear.h>
+#include "spear13xx-dma.h"
+
/* common dw_dma filter routine to be used by peripherals */
bool dw_dma_filter(struct dma_chan *chan, void *slave)
{