summaryrefslogtreecommitdiffstats
path: root/drivers/dma/Kconfig
diff options
context:
space:
mode:
authorJavier Martin <javier.martin@vista-silicon.com>2012-03-22 14:54:01 +0100
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-26 11:31:29 +0530
commit6bd081277ea03e2b165fc68534b61bc64db93990 (patch)
tree288ba74063dcc002a347cefcfb65e70bc5b63d22 /drivers/dma/Kconfig
parentbeeaa103eecc7a132682c40867f0ef70655383a5 (diff)
downloadlinux-6bd081277ea03e2b165fc68534b61bc64db93990.tar.gz
linux-6bd081277ea03e2b165fc68534b61bc64db93990.tar.xz
linux-6bd081277ea03e2b165fc68534b61bc64db93990.zip
dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
It is mainly a simple merge changing the prefix of some functions to fit the imx-dma namings. As there are no users of the old dma-v1.c api we can safely remove this file. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/Kconfig')
-rw-r--r--drivers/dma/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 65c61dba66de..b4a53a0eeaf2 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -230,7 +230,6 @@ config IMX_SDMA
config IMX_DMA
tristate "i.MX DMA support"
- depends on IMX_HAVE_DMA_V1
select DMA_ENGINE
help
Support the i.MX DMA engine. This engine is integrated into