diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-09 06:46:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-09 06:46:49 -0400 |
| commit | e3560336be655c6791316482fe288b119f34c427 (patch) | |
| tree | 43ca9a6b489aaa3918b773f78a7eda37458ef0a8 /crypto/async_tx/async_xor.c | |
| parent | 26528e773ecc74fb1b61b7275f86f761cbb340ec (diff) | |
| parent | 7b2aa037e878c939676675969983284a02958ae3 (diff) | |
Merge branch 'linus' into tracing/urgent
Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
(on which we'll queue up a dependent fix)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'crypto/async_tx/async_xor.c')
| -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 |