summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorHuang Shijie <shijie8@gmail.com>2012-06-06 21:22:59 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2012-06-07 14:55:37 +0530
commitf5c55847f7ae31275c3305c997330e5fefa9fa0e (patch)
treeaf9af100acffaf06fe455ebbd8bf074e05f3e9e4 /drivers/dma
parent5a67ac572e102f7d877b8a3a18a59315186e3e99 (diff)
downloadblackbird-op-linux-f5c55847f7ae31275c3305c997330e5fefa9fa0e.tar.gz
blackbird-op-linux-f5c55847f7ae31275c3305c997330e5fefa9fa0e.zip
dma: enable mxs-dma for imx6q
enable the mxs-dma for imx6q. Also remove the unused header file. Signed-off-by: Huang Shijie <shijie8@gmail.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/Kconfig2
-rw-r--r--drivers/dma/mxs-dma.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index aadeb5be9dba..c8416d54f917 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -237,7 +237,7 @@ config IMX_DMA
config MXS_DMA
bool "MXS DMA support"
- depends on SOC_IMX23 || SOC_IMX28
+ depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q
select STMP_DEVICE
select DMA_ENGINE
help
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index c96ab15319f2..90b980d014aa 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -29,7 +29,6 @@
#include <linux/of_device.h>
#include <asm/irq.h>
-#include <mach/mxs.h>
#include "dmaengine.h"
OpenPOWER on IntegriCloud