Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index cde83f41d874859b9a1c34ae5eadbbe034399aff..739f797b40d9843b7d75261e955439866c7aaa83 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -339,6 +339,20 @@ config MV_XOR
        ---help---
          Enable support for the Marvell XOR engine.
 
+config MV_XOR_V2
+       bool "Marvell XOR engine version 2 support "
+       depends on ARM64
+       select DMA_ENGINE
+       select DMA_ENGINE_RAID
+       select ASYNC_TX_ENABLE_CHANNEL_SWITCH
+       select GENERIC_MSI_IRQ_DOMAIN
+       ---help---
+         Enable support for the Marvell version 2 XOR engine.
+
+         This engine provides acceleration for copy, XOR and RAID6
+         operations, and is available on Marvell Armada 7K and 8K
+         platforms.
+
 config MXS_DMA
        bool "MXS DMA support"
        depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q || SOC_IMX6UL