Merge branch 'async' of macbook:git/btrfs-unstable

[sfrench/cifs-2.6.git] / crypto / async_tx / Kconfig

diff --git a/crypto/async_tx/Kconfig b/crypto/async_tx/Kconfig
index e28e276ac611d9d9bd25011b1cefc200456d6242..5de2ed13b35d46dbaeff1074d7233ba6dd4a38bb 100644 (file)
--- a/crypto/async_tx/Kconfig
+++ b/crypto/async_tx/Kconfig
@@ -22,6 +22,20 @@ 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.
 
 config ASYNC_TX_DISABLE_PQ_VAL_DMA
        bool