Merge tag 'iio-for-4.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[karo-tx-linux.git] / drivers / md / Kconfig

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 7468a22f9d10dcf26809d99bcf7dcd0f3b85378e..906103c168ea30ca3062b7cd78d2423587f54ba4 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -200,6 +200,7 @@ config BLK_DEV_DM_BUILTIN
 config BLK_DEV_DM
        tristate "Device mapper support"
        select BLK_DEV_DM_BUILTIN
+       select DAX
        ---help---
          Device-mapper is a low level volume manager.  It works by allowing
          people to specify mappings for ranges of logical sectors.  Various
@@ -502,13 +503,24 @@ config DM_LOG_WRITES
          If unsure, say N.
 
 config DM_INTEGRITY
-       tristate "Integrity target"
+       tristate "Integrity target support"
        depends on BLK_DEV_DM
        select BLK_DEV_INTEGRITY
        select DM_BUFIO
        select CRYPTO
        select ASYNC_XOR
        ---help---
-          This is the integrity target.
+         This device-mapper target emulates a block device that has
+         additional per-sector tags that can be used for storing
+         integrity information.
+
+         This integrity target is used with the dm-crypt target to
+         provide authenticated disk encryption or it can be used
+         standalone.
+
+         To compile this code as a module, choose M here: the module will
+         be called dm-integrity.
+
+         If unsure, say N.
 
 endif # MD