projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5a67ac5)
dma: enable mxs-dma for imx6q
authorHuang Shijie <shijie8@gmail.com>
Thu, 7 Jun 2012 01:22:59 +0000 (21:22 -0400)
committerVinod Koul <vinod.koul@linux.intel.com>
Thu, 7 Jun 2012 09:25:37 +0000 (14:55 +0530)
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>
drivers/dma/Kconfig patch | blob | blame | history
drivers/dma/mxs-dma.c patch | blob | blame | history

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index aadeb5be9dba25249d0215e3881b484fcfb813ac..c8416d54f917d117c0008e7f8e127ef8c187e7de 100644 (file)
--- 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 c96ab15319f245c363bf1ed693c5a61e0669fcef..90b980d014aaa37ff166456941f10fbe42151c17 100644 (file)
--- 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"