diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:46:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:46:31 -0700 |
| commit | db06816cb9ceb21a2bf24122407b7b4fe419c3fc (patch) | |
| tree | 25a96cbc392edfe35ea6dcfaa4b0b2a7601d779d /crypto | |
| parent | 784b1d6b21cb25791b68276af27a7c2321d5a86f (diff) | |
| parent | 808347f6a31792079e345ec865e9cfcb6e8ae6b2 (diff) | |
| download | talos-op-linux-db06816cb9ceb21a2bf24122407b7b4fe419c3fc.tar.gz talos-op-linux-db06816cb9ceb21a2bf24122407b7b4fe419c3fc.zip | |
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 'crypto')
| -rw-r--r-- | crypto/async_tx/async_xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 95fe2c8d6c51..90dd3f8bd283 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -300,7 +300,7 @@ EXPORT_SYMBOL_GPL(async_xor_zero_sum); static int __init async_xor_init(void) { - #ifdef CONFIG_DMA_ENGINE + #ifdef CONFIG_ASYNC_TX_DMA /* To conserve stack space the input src_list (array of page pointers) * is reused to hold the array of dma addresses passed to the driver. * This conversion is only possible when dma_addr_t is less than the |
