diff --git a/[refs] b/[refs] index 570b0fe36d35..3020d98d9a1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8902adcc1a9fd484c8cb5e575152e32192c1ff8 +refs/heads/master: 9a8de639f35ca3951b910d5e3a2f92f4cf3afc8f diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig index 3230a780c3de..5903a88351bf 100644 --- a/trunk/drivers/dma/Kconfig +++ b/trunk/drivers/dma/Kconfig @@ -128,7 +128,7 @@ config NET_DMA config ASYNC_TX_DMA bool "Async_tx: Offload support for the async_tx api" - depends on DMA_ENGINE && !HIGHMEM64G + depends on DMA_ENGINE help This allows the async_tx api to take advantage of offload engines for memcpy, memset, xor, and raid6 p+q operations. If your platform has