Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[powerpc.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 30d021d..9c91b0f 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -2,33 +2,52 @@
 # DMA engine configuration
 #
 
-menu "DMA Engine support"
+menuconfig DMADEVICES
+       bool "DMA Offload Engine support"
+       depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
+       help
+         Intel(R) offload engines enable offloading memory copies in the
+         network stack and RAID operations in the MD driver.
+
+if DMADEVICES
+
+comment "DMA Devices"
+
+config INTEL_IOATDMA
+       tristate "Intel I/OAT DMA support"
+       depends on PCI && X86
+       select DMA_ENGINE
+       select DCA
+       help
+         Enable support for the Intel(R) I/OAT DMA engine present
+         in recent Intel Xeon chipsets.
+
+         Say Y here if you have such a chipset.
+
+         If unsure, say N.
+
+config INTEL_IOP_ADMA
+       tristate "Intel IOP ADMA support"
+       depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
+       select ASYNC_CORE
+       select DMA_ENGINE
+       help
+         Enable support for the Intel(R) IOP Series RAID engines.
 
 config DMA_ENGINE
-       bool "Support for DMA engines"
-       ---help---
-         DMA engines offload copy operations from the CPU to dedicated
-         hardware, allowing the copies to happen asynchronously.
+       bool
 
 comment "DMA Clients"
+       depends on DMA_ENGINE
 
 config NET_DMA
        bool "Network: TCP receive copy offload"
        depends on DMA_ENGINE && NET
        default y
-       ---help---
+       help
          This enables the use of DMA engines in the network stack to
          offload receive copy-to-user operations, freeing CPU cycles.
          Since this is the main user of the DMA engine, it should be enabled;
          say Y here.
 
-comment "DMA Devices"
-
-config INTEL_IOATDMA
-       tristate "Intel I/OAT DMA support"
-       depends on DMA_ENGINE && PCI
-       default m
-       ---help---
-         Enable support for the Intel(R) I/OAT DMA engine.
-
-endmenu
+endif