Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / drivers / md / Kconfig

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 30b426e..f2ccbc3 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -297,6 +297,17 @@ config DM_MIRROR
          Allow volume managers to mirror logical volumes, also
          needed for live data migration tools such as 'pvmove'.
 
          Allow volume managers to mirror logical volumes, also
          needed for live data migration tools such as 'pvmove'.
 

+config DM_LOG_USERSPACE
+       tristate "Mirror userspace logging"
+       depends on DM_MIRROR && NET
+       select CONNECTOR
+       ---help---
+         The userspace logging module provides a mechanism for
+         relaying the dm-dirty-log API to userspace.  Log designs
+         which are more suited to userspace implementation (e.g.
+         shared storage logs) or experimental logs can be implemented
+         by leveraging this framework.
+

 config DM_RAID
        tristate "RAID 1/4/5/6/10 target"
        depends on BLK_DEV_DM
 config DM_RAID
        tristate "RAID 1/4/5/6/10 target"
        depends on BLK_DEV_DM


@@ -323,17 +334,6 @@ config DM_RAID
         RAID-5, RAID-6 distributes the syndromes across the drives
         in one of the available parity distribution methods.
 
         RAID-5, RAID-6 distributes the syndromes across the drives
         in one of the available parity distribution methods.
 

-config DM_LOG_USERSPACE
-       tristate "Mirror userspace logging"
-       depends on DM_MIRROR && NET
-       select CONNECTOR
-       ---help---
-         The userspace logging module provides a mechanism for
-         relaying the dm-dirty-log API to userspace.  Log designs
-         which are more suited to userspace implementation (e.g.
-         shared storage logs) or experimental logs can be implemented
-         by leveraging this framework.
-

 config DM_ZERO
        tristate "Zero target"
        depends on BLK_DEV_DM
 config DM_ZERO
        tristate "Zero target"
        depends on BLK_DEV_DM