diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /crypto | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
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); | |||
| 300 | 300 | ||
| 301 | static int __init async_xor_init(void) | 301 | static int __init async_xor_init(void) |
| 302 | { | 302 | { |
| 303 | #ifdef CONFIG_DMA_ENGINE | 303 | #ifdef CONFIG_ASYNC_TX_DMA |
| 304 | /* To conserve stack space the input src_list (array of page pointers) | 304 | /* To conserve stack space the input src_list (array of page pointers) |
| 305 | * is reused to hold the array of dma addresses passed to the driver. | 305 | * is reused to hold the array of dma addresses passed to the driver. |
| 306 | * This conversion is only possible when dma_addr_t is less than the | 306 | * This conversion is only possible when dma_addr_t is less than the |