Merge branch 'linus' into timers/core

Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

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