diff options
| author | Huang Shijie <shijie8@gmail.com> | 2012-06-06 21:22:59 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-06-07 05:25:37 -0400 |
| commit | f5c55847f7ae31275c3305c997330e5fefa9fa0e (patch) | |
| tree | af9af100acffaf06fe455ebbd8bf074e05f3e9e4 /drivers | |
| parent | 5a67ac572e102f7d877b8a3a18a59315186e3e99 (diff) | |
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')
| -rw-r--r-- | drivers/dma/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/dma/mxs-dma.c | 1 |
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 | |||
| 237 | 237 | ||
| 238 | config MXS_DMA | 238 | config MXS_DMA |
| 239 | bool "MXS DMA support" | 239 | bool "MXS DMA support" |
| 240 | depends on SOC_IMX23 || SOC_IMX28 | 240 | depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q |
| 241 | select STMP_DEVICE | 241 | select STMP_DEVICE |
| 242 | select DMA_ENGINE | 242 | select DMA_ENGINE |
| 243 | help | 243 | 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 @@ | |||
| 29 | #include <linux/of_device.h> | 29 | #include <linux/of_device.h> |
| 30 | 30 | ||
| 31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
| 32 | #include <mach/mxs.h> | ||
| 33 | 32 | ||
| 34 | #include "dmaengine.h" | 33 | #include "dmaengine.h" |
| 35 | 34 | ||