diff options
| author | Javier Martin <javier.martin@vista-silicon.com> | 2012-03-22 09:54:01 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-26 02:01:29 -0400 |
| commit | 6bd081277ea03e2b165fc68534b61bc64db93990 (patch) | |
| tree | 288ba74063dcc002a347cefcfb65e70bc5b63d22 /drivers/dma/Kconfig | |
| parent | beeaa103eecc7a132682c40867f0ef70655383a5 (diff) | |
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/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 65c61dba66d..b4a53a0eeaf 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -230,7 +230,6 @@ config IMX_SDMA | |||
| 230 | 230 | ||
| 231 | config IMX_DMA | 231 | config IMX_DMA |
| 232 | tristate "i.MX DMA support" | 232 | tristate "i.MX DMA support" |
| 233 | depends on IMX_HAVE_DMA_V1 | ||
| 234 | select DMA_ENGINE | 233 | select DMA_ENGINE |
| 235 | help | 234 | help |
| 236 | Support the i.MX DMA engine. This engine is integrated into | 235 | Support the i.MX DMA engine. This engine is integrated into |