Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / md / Kconfig

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 466909f38d9897c11d74c9193005e084066daeaf..34a8c60a254a690c288b112ff71d7cdf0a306d6a 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -2,19 +2,17 @@
 # Block device driver configuration
 #
 
-if BLOCK
-
-menu "Multi-device support (RAID and LVM)"
-
-config MD
+menuconfig MD
        bool "Multiple devices driver support (RAID and LVM)"
+       depends on BLOCK
        help
          Support multiple physical spindles through a single logical device.
          Required for RAID and logical volume management.
 
+if MD
+
 config BLK_DEV_MD
        tristate "RAID support"
-       depends on MD
        ---help---
          This driver lets you combine several hard disk partitions into one
          logical block device. This can be used to simply append one
@@ -109,6 +107,8 @@ config MD_RAID10
 config MD_RAID456
        tristate "RAID-4/RAID-5/RAID-6 mode"
        depends on BLK_DEV_MD
+       select ASYNC_MEMCPY
+       select ASYNC_XOR
        ---help---
          A RAID-5 set of N drives with a capacity of C MB per drive provides
          the capacity of C * (N - 1) MB, and protects against a failure
@@ -189,7 +189,6 @@ config MD_FAULTY
 
 config BLK_DEV_DM
        tristate "Device mapper support"
-       depends on MD
        ---help---
          Device-mapper is a low level volume manager.  It works by allowing
          people to specify mappings for ranges of logical sectors.  Various
@@ -264,7 +263,7 @@ config DM_MULTIPATH_EMC
 
 config DM_MULTIPATH_RDAC
        tristate "LSI/Engenio RDAC multipath support (EXPERIMENTAL)"
-       depends on DM_MULTIPATH && BLK_DEV_DM && EXPERIMENTAL
+       depends on DM_MULTIPATH && BLK_DEV_DM && SCSI && EXPERIMENTAL
        ---help---
          Multipath support for LSI/Engenio RDAC.
 
@@ -277,6 +276,4 @@ config DM_DELAY
 
        If unsure, say N.
 
-endmenu
-
-endif
+endif # MD