aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-10-29 16:41:49 +0000
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-10-29 16:41:49 +0000
commite5d84970a554d5c0072043a7b9f0f5b88b5fdfe1 (patch)
tree859350aff787a5117b45a1066ab88bf158f97162
parentf5e70d0fe3ea990cfb3fc8d7f76a719adcb1e0b5 (diff)
downloadkernel_samsung_smdk4412-e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1.zip
kernel_samsung_smdk4412-e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1.tar.gz
kernel_samsung_smdk4412-e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1.tar.bz2
async_tx: Move ASYNC_RAID6_TEST option to crypto/async_tx/, fix dependencies
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--crypto/async_tx/Kconfig14
-rw-r--r--drivers/md/Kconfig13
2 files changed, 14 insertions, 13 deletions
diff --git a/crypto/async_tx/Kconfig b/crypto/async_tx/Kconfig
index e5aeb2b..e24aa80 100644
--- 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 891f7c8..e27ae46 100644
--- 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