diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 19:46:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 19:46:31 -0400 |
commit | db06816cb9ceb21a2bf24122407b7b4fe419c3fc (patch) | |
tree | 25a96cbc392edfe35ea6dcfaa4b0b2a7601d779d /drivers/dma/Kconfig | |
parent | 784b1d6b21cb25791b68276af27a7c2321d5a86f (diff) | |
parent | 808347f6a31792079e345ec865e9cfcb6e8ae6b2 (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: at_hdmac: add DMA slave transfers
dmaengine: at_hdmac: new driver for the Atmel AHB DMA Controller
dmaengine: dmatest: correct thread_count while using multiple thread per channel
dmaengine: dmatest: add a maximum number of test iterations
drivers/dma: Remove unnecessary semicolons
drivers/dma/fsldma.c: Remove unnecessary semicolons
dmaengine: move HIGHMEM64G restriction to ASYNC_TX_DMA
fsldma: do not clear bandwidth control bits on the 83xx controller
fsldma: enable external start for the 83xx controller
fsldma: use PCI Read Multiple command
Diffstat (limited to 'drivers/dma/Kconfig')
-rw-r--r-- | drivers/dma/Kconfig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 070357aaedb..81e1020fb51 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | menuconfig DMADEVICES | 5 | menuconfig DMADEVICES |
6 | bool "DMA Engine support" | 6 | bool "DMA Engine support" |
7 | depends on !HIGHMEM64G && HAS_DMA | 7 | depends on HAS_DMA |
8 | help | 8 | help |
9 | DMA engines can do asynchronous data transfers without | 9 | DMA engines can do asynchronous data transfers without |
10 | involving the host CPU. Currently, this framework can be | 10 | involving the host CPU. Currently, this framework can be |
@@ -46,6 +46,14 @@ config DW_DMAC | |||
46 | Support the Synopsys DesignWare AHB DMA controller. This | 46 | Support the Synopsys DesignWare AHB DMA controller. This |
47 | can be integrated in chips such as the Atmel AT32ap7000. | 47 | can be integrated in chips such as the Atmel AT32ap7000. |
48 | 48 | ||
49 | config AT_HDMAC | ||
50 | tristate "Atmel AHB DMA support" | ||
51 | depends on ARCH_AT91SAM9RL | ||
52 | select DMA_ENGINE | ||
53 | help | ||
54 | Support the Atmel AHB DMA controller. This can be integrated in | ||
55 | chips such as the Atmel AT91SAM9RL. | ||
56 | |||
49 | config FSL_DMA | 57 | config FSL_DMA |
50 | tristate "Freescale Elo and Elo Plus DMA support" | 58 | tristate "Freescale Elo and Elo Plus DMA support" |
51 | depends on FSL_SOC | 59 | depends on FSL_SOC |
@@ -108,7 +116,7 @@ config NET_DMA | |||
108 | 116 | ||
109 | config ASYNC_TX_DMA | 117 | config ASYNC_TX_DMA |
110 | bool "Async_tx: Offload support for the async_tx api" | 118 | bool "Async_tx: Offload support for the async_tx api" |
111 | depends on DMA_ENGINE | 119 | depends on DMA_ENGINE && !HIGHMEM64G |
112 | help | 120 | help |
113 | This allows the async_tx api to take advantage of offload engines for | 121 | This allows the async_tx api to take advantage of offload engines for |
114 | memcpy, memset, xor, and raid6 p+q operations. If your platform has | 122 | memcpy, memset, xor, and raid6 p+q operations. If your platform has |