diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2008-10-12 11:08:46 +0200 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-10-12 11:08:46 +0200 |
commit | 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e (patch) | |
tree | cf8f017f44b768445eecb6698c47d479c6b46a01 /drivers/mmc/host/Kconfig | |
parent | 162350eb75fcb81ec0ea34f042f1deddb759aea8 (diff) | |
parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 (diff) |
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
Diffstat (limited to 'drivers/mmc/host/Kconfig')
-rw-r--r-- | drivers/mmc/host/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 38468b2bd1a..dfa585f7fea 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 |