---

yaml --- r: 208387 b: refs/heads/master c: e5d8497 h: refs/heads/master i: 208385: 7ace1ef 208383: 1622465 v: v3
git-mirror · Oct 29, 2009 · 1b734b4 · 1b734b4
1 parent a499c22
commit 1b734b4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5e70d0fe3ea990cfb3fc8d7f76a719adcb1e0b5
+refs/heads/master: e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1
diff --git a/trunk/crypto/async_tx/Kconfig b/trunk/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/trunk/drivers/md/Kconfig b/trunk/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