@@ -20,10 +20,11 @@
#include <linux/of_platform.h>
#include <asm/hardware/gic.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)
similarity index 100%
rename from arch/arm/mach-spear13xx/include/mach/dma.h
rename to arch/arm/mach-spear13xx/spear13xx-dma.h
@@ -22,10 +22,11 @@
#include <asm/hardware/gic.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)
{
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> --- arch/arm/mach-spear13xx/spear1340.c | 3 ++- arch/arm/mach-spear13xx/{include/mach/dma.h => spear13xx-dma.h} | 0 arch/arm/mach-spear13xx/spear13xx.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) rename arch/arm/mach-spear13xx/{include/mach/dma.h => spear13xx-dma.h} (100%)