diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-08-09 10:36:44 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-08-09 10:36:44 +0100 |
| commit | 2144381da478cc4aa3a29ee29b0c5e6ddaaced14 (patch) | |
| tree | 380a29fec86b537ed602d12f4050654b1c66c27c /drivers/md/Kconfig | |
| parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff) | |
| parent | e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1 (diff) | |
| download | linux-3.10-2144381da478cc4aa3a29ee29b0c5e6ddaaced14.tar.gz linux-3.10-2144381da478cc4aa3a29ee29b0c5e6ddaaced14.tar.bz2 linux-3.10-2144381da478cc4aa3a29ee29b0c5e6ddaaced14.zip | |
Merge branch 'async' of macbook:git/btrfs-unstable
Conflicts:
drivers/md/Makefile
lib/raid6/unroll.pl
Diffstat (limited to 'drivers/md/Kconfig')
| -rw-r--r-- | drivers/md/Kconfig | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index 4a6feac8c94..bf1a95e3155 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 |