Merge tag 'dmaengine-4.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 7ba2847..b458475 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -147,7 +147,7 @@ config DMA_SA11X0
 
 config DMA_SUN4I
        tristate "Allwinner A10 DMA SoCs support"
-       depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || COMPILE_TEST
+       depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
        default (MACH_SUN4I || MACH_SUN5I || MACH_SUN7I)
        select DMA_ENGINE
        select DMA_OF
@@ -229,6 +229,14 @@ config IMX_SDMA
          Support the i.MX SDMA engine. This engine is integrated into
          Freescale i.MX25/31/35/51/53/6 chips.
 
+config IDMA64
+       tristate "Intel integrated DMA 64-bit support"
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Enable DMA support for Intel Low Power Subsystem such as found on
+         Intel Skylake PCH.
+
 config INTEL_IOATDMA
        tristate "Intel I/OAT DMA support"
        depends on PCI && X86_64