Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[sfrench/cifs-2.6.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index a50f481116477e9552c82db45f728bc067dbbbbd..1d16b08e15063e97d17d3c519deecc3395e2ff3c 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -1,7 +1,7 @@
 #
 # Block layer core configuration
 #
-config BLOCK
+menuconfig BLOCK
        bool "Enable the block layer" if EMBEDDED
        default y
        help
@@ -49,6 +49,14 @@ config LSF
 
          If unsure, say Y.
 
-endif
+endif # BLOCK
+
+config BLK_DEV_BSG
+       bool "Block layer SG support"
+       depends on SCSI && EXPERIMENTAL
+       default y
+       ---help---
+       Saying Y here will enable generic SG (SCSI generic) v4
+       support for any block device.
 
 source block/Kconfig.iosched