Pull virt-cpu-accounting into release branch

[linux-2.6] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 9c91b0fd134f231c83a89a4d250f6922575b49a0..27340a7b19dddb8129f8ca85e8c24cc90075b6c3 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -3,11 +3,14 @@
 #
 
 menuconfig DMADEVICES
-       bool "DMA Offload Engine support"
-       depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
+       bool "DMA Engine support"
+       depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX || PPC
+       depends on !HIGHMEM64G
        help
-         Intel(R) offload engines enable offloading memory copies in the
-         network stack and RAID operations in the MD driver.
+         DMA engines can do asynchronous data transfers without
+         involving the host CPU.  Currently, this framework can be
+         used to offload memory copies in the network stack and
+         RAID operations in the MD driver.
 
 if DMADEVICES
 
@@ -34,6 +37,23 @@ config INTEL_IOP_ADMA
        help
          Enable support for the Intel(R) IOP Series RAID engines.
 
+config FSL_DMA
+       bool "Freescale MPC85xx/MPC83xx DMA support"
+       depends on PPC
+       select DMA_ENGINE
+       ---help---
+         Enable support for the Freescale DMA engine. Now, it support
+         MPC8560/40, MPC8555, MPC8548 and MPC8641 processors.
+         The MPC8349, MPC8360 is also supported.
+
+config FSL_DMA_SELFTEST
+       bool "Enable the self test for each DMA channel"
+       depends on FSL_DMA
+       default y
+       ---help---
+         Enable the self test for each DMA channel. A self test will be
+         performed after the channel probed to ensure the DMA works well.
+
 config DMA_ENGINE
        bool
 
@@ -43,7 +63,6 @@ comment "DMA Clients"
 config NET_DMA
        bool "Network: TCP receive copy offload"
        depends on DMA_ENGINE && NET
-       default y
        help
          This enables the use of DMA engines in the network stack to
          offload receive copy-to-user operations, freeing CPU cycles.