Merge branch 'topic/sprd' into for-linus

Kconfig and Makefile conflicts so put them in right order (sprd ones after
stm ones)

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 4002d1c65221..27df3e2837fd 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -504,6 +504,14 @@ config STM32_MDMA
           If you have a board based on STM32 SoC and wish to use the master DMA
           say Y here.
 
+config SPRD_DMA
+        tristate "Spreadtrum DMA support"
+        depends on ARCH_SPRD || COMPILE_TEST
+        select DMA_ENGINE
+        select DMA_VIRTUAL_CHANNELS
+        help
+          Enable support for the on-chip DMA controller on Spreadtrum platform.
+
 config S3C24XX_DMAC
         bool "Samsung S3C24XX DMA support"
         depends on ARCH_S3C24XX || COMPILE_TEST