Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 42 insertions, 1 deletions

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index b401dadad4a8..c27f80e5d531 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -13,6 +13,22 @@ menuconfig DMADEVICES
           DMA Device drivers supported by the configured arch, it may
           be empty in some cases.
 
+config DMADEVICES_DEBUG
+        bool "DMA Engine debugging"
+        depends on DMADEVICES != n
+        help
+          This is an option for use by developers; most people should
+          say N here.  This enables DMA engine core and driver debugging.
+
+config DMADEVICES_VDEBUG
+        bool "DMA Engine verbose debugging"
+        depends on DMADEVICES_DEBUG != n
+        help
+          This is an option for use by developers; most people should
+          say N here.  This enables deeper (more verbose) debugging of
+          the DMA engine core and drivers.
+
+
 if DMADEVICES
 
 comment "DMA Devices"
@@ -54,7 +70,7 @@ config DW_DMAC
 
 config AT_HDMAC
         tristate "Atmel AHB DMA support"
-        depends on ARCH_AT91SAM9RL
+        depends on ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
         select DMA_ENGINE
         help
           Support the Atmel AHB DMA controller.  This can be integrated in
@@ -69,6 +85,13 @@ config FSL_DMA
           The Elo is the DMA controller on some 82xx and 83xx parts, and the
           Elo Plus is the DMA controller on 85xx and 86xx parts.
 
+config MPC512X_DMA
+        tristate "Freescale MPC512x built-in DMA engine support"
+        depends on PPC_MPC512x
+        select DMA_ENGINE
+        ---help---
+          Enable support for the Freescale MPC512x built-in DMA engine.
+
 config MV_XOR
         bool "Marvell XOR engine support"
         depends on PLAT_ORION
@@ -111,6 +134,24 @@ config SH_DMAE
         help
           Enable support for the Renesas SuperH DMA controllers.
 
+config COH901318
+        bool "ST-Ericsson COH901318 DMA support"
+        select DMA_ENGINE
+        depends on ARCH_U300
+        help
+          Enable support for ST-Ericsson COH 901 318 DMA.
+
+config AMCC_PPC440SPE_ADMA
+        tristate "AMCC PPC440SPe ADMA support"
+        depends on 440SPe || 440SP
+        select DMA_ENGINE
+        select ARCH_HAS_ASYNC_TX_FIND_CHANNEL
+        help
+          Enable support for the AMCC PPC440SPe RAID engines.
+
+config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
+        bool
+
 config DMA_ENGINE
         bool