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 /arch/arm/mach-imx/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 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0e6de366c648..3da1421c944f 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | config IMX_HAVE_DMA_V1 | ||
| 2 | bool | ||
| 3 | |||
| 4 | config HAVE_IMX_GPC | 1 | config HAVE_IMX_GPC |
| 5 | bool | 2 | bool |
| 6 | 3 | ||
| @@ -26,7 +23,6 @@ config SOC_IMX1 | |||
| 26 | bool | 23 | bool |
| 27 | select ARCH_MX1 | 24 | select ARCH_MX1 |
| 28 | select CPU_ARM920T | 25 | select CPU_ARM920T |
| 29 | select IMX_HAVE_DMA_V1 | ||
| 30 | select IMX_HAVE_IOMUX_V1 | 26 | select IMX_HAVE_IOMUX_V1 |
| 31 | select MXC_AVIC | 27 | select MXC_AVIC |
| 32 | 28 | ||
| @@ -35,7 +31,6 @@ config SOC_IMX21 | |||
| 35 | select MACH_MX21 | 31 | select MACH_MX21 |
| 36 | select CPU_ARM926T | 32 | select CPU_ARM926T |
| 37 | select ARCH_MXC_AUDMUX_V1 | 33 | select ARCH_MXC_AUDMUX_V1 |
| 38 | select IMX_HAVE_DMA_V1 | ||
| 39 | select IMX_HAVE_IOMUX_V1 | 34 | select IMX_HAVE_IOMUX_V1 |
| 40 | select MXC_AVIC | 35 | select MXC_AVIC |
| 41 | 36 | ||
| @@ -52,7 +47,6 @@ config SOC_IMX27 | |||
| 52 | select MACH_MX27 | 47 | select MACH_MX27 |
| 53 | select CPU_ARM926T | 48 | select CPU_ARM926T |
| 54 | select ARCH_MXC_AUDMUX_V1 | 49 | select ARCH_MXC_AUDMUX_V1 |
| 55 | select IMX_HAVE_DMA_V1 | ||
| 56 | select IMX_HAVE_IOMUX_V1 | 50 | select IMX_HAVE_IOMUX_V1 |
| 57 | select MXC_AVIC | 51 | select MXC_AVIC |
| 58 | 52 | ||