Merge branch 'misc_devel_3.4' of git://git.pwsan.com/linux-2.6 into fixes

[firefly-linux-kernel-4.4.55.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index f1a274994bb1fbdc1c8e0e54b26aebe58b161c2b..cf9da362d64f9a233512ce7a228bccad25906197 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -201,7 +201,6 @@ config PL330_DMA
        tristate "DMA API Driver for PL330"
        select DMA_ENGINE
        depends on ARM_AMBA
-       select PL330
        help
          Select if your platform has one or more PL330 DMACs.
          You need to provide platform specific settings via
@@ -231,7 +230,7 @@ config IMX_SDMA
 
 config IMX_DMA
        tristate "i.MX DMA support"
-       depends on IMX_HAVE_DMA_V1
+       depends on ARCH_MXC
        select DMA_ENGINE
        help
          Support the i.MX DMA engine. This engine is integrated into
@@ -252,6 +251,15 @@ config EP93XX_DMA
        help
          Enable support for the Cirrus Logic EP93xx M2P/M2M DMA controller.
 
+config DMA_SA11X0
+       tristate "SA-11x0 DMA support"
+       depends on ARCH_SA1100
+       select DMA_ENGINE
+       help
+         Support the DMA engine found on Intel StrongARM SA-1100 and
+         SA-1110 SoCs.  This DMA engine can only be used with on-chip
+         devices.
+
 config DMA_ENGINE
        bool