X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2FKconfig;h=161491d0a879ed11ce2276a1923a60bc1d92479e;hb=ab664b93981c79d613aacd0ac1c85cf96cada44a;hp=7f38e40fee0819a74ec6b3d10c759c07d3b04bb4;hpb=f07d7eb59119a4e72372fa60a2198f20f5302f95;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/Kconfig b/block/Kconfig
index 7f38e40fee08..161491d0a879 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -77,6 +77,7 @@ config BLK_DEV_BSGLIB
 
 config BLK_DEV_INTEGRITY
 	bool "Block layer data integrity support"
+	select CRC_T10DIF if BLK_DEV_INTEGRITY
 	---help---
 	Some storage devices allow extra information to be
 	stored/retrieved to help protect the data.  The block layer
@@ -99,11 +100,16 @@ config BLK_DEV_THROTTLING
 
 	See Documentation/cgroups/blkio-controller.txt for more information.
 
-config CMDLINE_PARSER
+config BLK_CMDLINE_PARSER
 	bool "Block device command line partition parser"
 	default n
 	---help---
-	Parsing command line, get the partitions information.
+	Enabling this option allows you to specify the partition layout from
+	the kernel boot args.  This is typically of use for embedded devices
+	which don't otherwise have any standardized method for listing the
+	partitions on a block device.
+
+	See Documentation/block/cmdline-partition.txt for more information.
 
 menu "Partition Types"