dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
authorJavier Martin <javier.martin@vista-silicon.com>
Thu, 22 Mar 2012 13:54:01 +0000 (14:54 +0100)
committerVinod Koul <vinod.koul@linux.intel.com>
Mon, 26 Mar 2012 06:01:29 +0000 (11:31 +0530)
commit6bd081277ea03e2b165fc68534b61bc64db93990
tree288ba74063dcc002a347cefcfb65e70bc5b63d22
parentbeeaa103eecc7a132682c40867f0ef70655383a5
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>
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/dma-v1.c [deleted file]
arch/arm/mach-imx/include/mach/dma-v1.h [deleted file]
drivers/dma/Kconfig
drivers/dma/imx-dma.c