diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-10-14 13:42:53 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-14 16:27:11 +0200 |
| commit | 2b6b3b7420190888793c49e97276e1e73bd7eaed (patch) | |
| tree | b2226f638e1c7253389a80ebca7b02ed6737e58c /arch/arm/mach-omap2 | |
| parent | ARM: davinci: Add dma_mask to eDMA devices (diff) | |
| download | linux-2b6b3b7420190888793c49e97276e1e73bd7eaed.tar.xz linux-2b6b3b7420190888793c49e97276e1e73bd7eaed.zip | |
ARM/dmaengine: edma: Merge the two drivers under drivers/dma/
Move the code out from arch/arm/common and merge it inside of the dmaengine
driver.
This change is done with as minimal (if eny) functional change to the code
as possible to avoid introducing regression.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 07d2e100caab..e0b6736db984 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -90,7 +90,6 @@ config ARCH_OMAP2PLUS select OMAP_GPMC select PINCTRL select SOC_BUS - select TI_PRIV_EDMA select OMAP_IRQCHIP help Systems based on OMAP2, OMAP3, OMAP4 or OMAP5 |