diff options
| author | Javier Martin <javier.martin@vista-silicon.com> | 2012-03-22 14:54:01 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-26 11:31:29 +0530 |
| commit | 6bd081277ea03e2b165fc68534b61bc64db93990 (patch) | |
| tree | 288ba74063dcc002a347cefcfb65e70bc5b63d22 /arch/arm/mach-imx/Makefile | |
| 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 'arch/arm/mach-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index f5920c24f7d..a62dc3ac9dc 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,5 +1,3 @@ -obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o - obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o |