summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/apbh_dma.c2
-rw-r--r--drivers/mtd/nand/nand_mxs.c2
-rw-r--r--include/dma/apbh-dma.h (renamed from arch/arm/mach-mxs/include/mach/dma.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 2354364161..b0a20b8029 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -20,12 +20,12 @@
#include <common.h>
#include <malloc.h>
#include <errno.h>
+#include <dma/apbh-dma.h>
#include <stmp-device.h>
#include <asm/mmu.h>
#include <asm/io.h>
#include <mach/clock.h>
#include <mach/imx-regs.h>
-#include <mach/dma.h>
#define HW_APBHX_CTRL0 0x000
#define BM_APBH_CTRL0_APB_BURST8_EN (1 << 29)
diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c
index 046fcc30b3..f654af1fbf 100644
--- a/drivers/mtd/nand/nand_mxs.c
+++ b/drivers/mtd/nand/nand_mxs.c
@@ -28,12 +28,12 @@
#include <errno.h>
#include <driver.h>
#include <init.h>
+#include <dma/apbh-dma.h>
#include <stmp-device.h>
#include <asm/mmu.h>
#include <asm/io.h>
#include <mach/clock.h>
#include <mach/imx-regs.h>
-#include <mach/dma.h>
#define MX28_BLOCK_SFTRST (1 << 31)
#define MX28_BLOCK_CLKGATE (1 << 30)
diff --git a/arch/arm/mach-mxs/include/mach/dma.h b/include/dma/apbh-dma.h
index 52747e2fbf..52747e2fbf 100644
--- a/arch/arm/mach-mxs/include/mach/dma.h
+++ b/include/dma/apbh-dma.h