Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28

Conflicts:
	drivers/mmc/host/atmel-mci.c

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 38468b2bd1af..dfa585f7feaf 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -114,6 +114,17 @@ config MMC_ATMELMCI
 
           If unsure, say N.
 
+config MMC_ATMELMCI_DMA
+        bool "Atmel MCI DMA support (EXPERIMENTAL)"
+        depends on MMC_ATMELMCI && DMA_ENGINE && EXPERIMENTAL
+        help
+          Say Y here to have the Atmel MCI driver use a DMA engine to
+          do data transfers and thus increase the throughput and
+          reduce the CPU utilization. Note that this is highly
+          experimental and may cause the driver to lock up.
+
+          If unsure, say N.
+
 config MMC_IMX
         tristate "Motorola i.MX Multimedia Card Interface support"
         depends on ARCH_IMX