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

Conflicts:
	drivers/md/Makefile
	lib/raid6/unroll.pl

1 files changed, 1 insertions, 17 deletions

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 4a6feac8c94a..bf1a95e31559 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -121,7 +121,7 @@ config MD_RAID10
 config MD_RAID456
         tristate "RAID-4/RAID-5/RAID-6 mode"
         depends on BLK_DEV_MD
-        select MD_RAID6_PQ
+        select RAID6_PQ
         select ASYNC_MEMCPY
         select ASYNC_XOR
         select ASYNC_PQ
@@ -165,22 +165,6 @@ config MULTICORE_RAID456
 
           If unsure, say N.
 
-config MD_RAID6_PQ
-        tristate
-
-config ASYNC_RAID6_TEST
-        tristate "Self test for hardware accelerated raid6 recovery"
-        depends on MD_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