Merge branch 'master' into tk71

[mv-sheeva.git] / crypto / async_tx / Kconfig

diff --git a/crypto/async_tx/Kconfig b/crypto/async_tx/Kconfig
index 5de2ed13b35d46dbaeff1074d7233ba6dd4a38bb..1b11abbb5c912c2fe004eda04cd6d0244f7b8a17 100644 (file)
--- a/crypto/async_tx/Kconfig
+++ b/crypto/async_tx/Kconfig
@@ -24,19 +24,6 @@ config ASYNC_RAID6_RECOV
        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