Merge branches 'master' and 'devel' into for-linus

[deliverable/linux.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 8344375dc01552f9332a432f23d02440dc471709..9520cf02edc840f51c6aef659a9dbd5ef6a42806 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -33,6 +33,19 @@ if DMADEVICES
 
 comment "DMA Devices"
 
+config INTEL_MID_DMAC
+       tristate "Intel MID DMA support for Peripheral DMA controllers"
+       depends on PCI && X86
+       select DMA_ENGINE
+       default n
+       help
+         Enable support for the Intel(R) MID DMA engine present
+         in Intel MID chipsets.
+
+         Say Y here if you have such a chipset.
+
+         If unsure, say N.
+
 config ASYNC_TX_DISABLE_CHANNEL_SWITCH
        bool
 
@@ -175,6 +188,13 @@ config PL330_DMA
          You need to provide platform specific settings via
          platform_data for a dma-pl330 device.
 
+config PCH_DMA
+       tristate "Topcliff PCH DMA support"
+       depends on PCI && X86
+       select DMA_ENGINE
+       help
+         Enable support for the Topcliff PCH DMA engine.
+
 config DMA_ENGINE
        bool