Merge branch 'merge-fixes' into devel

[linux-2.6-microblaze.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 6597b60..7db9a41 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -38,7 +38,7 @@ config BLK_DEV_IO_TRACE
          on a block device queue. For more information (and the user space
          support tools needed), fetch the blktrace app from:
 
-         git://brick.kernel.dk/data/git/blktrace.git
+         git://git.kernel.dk/blktrace.git
 
 config LSF
        bool "Support for Large Single Files"
@@ -49,14 +49,24 @@ config LSF
 
          If unsure, say Y.
 
+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
 
-config BLK_DEV_BSG
-       bool "Block layer SG support"
-       depends on (SCSI=y) && EXPERIMENTAL
+config BLOCK_COMPAT
+       bool
+       depends on BLOCK && COMPAT
        default y
-       ---help---
-       Saying Y here will enable generic SG (SCSI generic) v4
-       support for any block device.
 
 source block/Kconfig.iosched