diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-10-14 14:42:53 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-14 19:57:11 +0530 |
| commit | 2b6b3b7420190888793c49e97276e1e73bd7eaed (patch) | |
| tree | b2226f638e1c7253389a80ebca7b02ed6737e58c /drivers/dma/Kconfig | |
| parent | cef5b0da4019358cb03c9b0a964d4d63cd7deaf6 (diff) | |
| download | op-kernel-dev-2b6b3b7420190888793c49e97276e1e73bd7eaed.zip op-kernel-dev-2b6b3b7420190888793c49e97276e1e73bd7eaed.tar.gz | |
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 '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 b458475..992efc8 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -486,7 +486,6 @@ config TI_EDMA depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE select DMA_ENGINE select DMA_VIRTUAL_CHANNELS - select TI_PRIV_EDMA default n help Enable support for the TI EDMA controller. This DMA |
