async_tx: Move ASYNC_RAID6_TEST option to crypto/async_tx/, fix dependencies

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/crypto/async_tx/Kconfig b/crypto/async_tx/Kconfig
index e5aeb2b79e6f956998b8bd0b2bc3bc882ab5067c..e24aa80087ad626edb4512c3a2cec96048852f19 100644 (file)
--- a/crypto/async_tx/Kconfig
+++ b/crypto/async_tx/Kconfig
@@ -22,4 +22,18 @@ config ASYNC_RAID6_RECOV
        tristate
        select ASYNC_CORE
        select ASYNC_PQ
+       select ASYNC_XOR
+
+config ASYNC_RAID6_TEST
+       tristate "Self test for hardware accelerated raid6 recovery"
+       depends on ASYNC_RAID6_RECOV
+       select ASYNC_MEMCPY
+       ---help---
+         This is a one-shot self test that permutes through the
+         recovery of all the possible two disk failure scenarios for a
+         N-disk array.  Recovery is performed with the asynchronous
+         raid6 recovery routines, and will optionally use an offload
+         engine if one is available.
+
+         If unsure, say N.
 

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 891f7c8490d388f662b0112f58c1218bac18e1b2..e27ae4604cef3c90d1fa46115341bad8cb59fd3c 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -165,19 +165,6 @@ config MULTICORE_RAID456
 
          If unsure, say N.
 
-config ASYNC_RAID6_TEST
-       tristate "Self test for hardware accelerated raid6 recovery"
-       depends on RAID6_PQ
-       select ASYNC_RAID6_RECOV
-       ---help---
-         This is a one-shot self test that permutes through the
-         recovery of all the possible two disk failure scenarios for a
-         N-disk array.  Recovery is performed with the asynchronous
-         raid6 recovery routines, and will optionally use an offload
-         engine if one is available.
-
-         If unsure, say N.
-
 config MD_MULTIPATH
        tristate "Multipath I/O support"
        depends on BLK_DEV_MD