Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/block/Kconfig b/block/Kconfig
index a50f481116477e9552c82db45f728bc067dbbbbd..2484e0e9d89c9127c0678052b18bfa879b8a827d 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,19 @@ config LSF
 
          If unsure, say Y.
 
-endif
+config BLK_DEV_BSG
+       bool "Block layer SG support v4 (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       ---help---
+       Saying Y here will enable generic SG (SCSI generic) v4 support
+       for any block device.
+
+       Unlike SG v3 (aka block/scsi_ioctl.c drivers/scsi/sg.c), SG v4
+       can handle complicated SCSI commands: tagged variable length cdbs
+       with bidirectional data transfers and generic request/response
+       protocols (e.g. Task Management Functions and SMP in Serial
+       Attached SCSI).
+
+endif # BLOCK
 
 source block/Kconfig.iosched