Merge branch 'merge-fixes' into devel

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

diff --git a/block/Kconfig b/block/Kconfig
index 0768741..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,11 +49,9 @@ config LSF
 
          If unsure, say Y.
 
-endif # BLOCK
-
 config BLK_DEV_BSG
        bool "Block layer SG support v4 (EXPERIMENTAL)"
-       depends on (SCSI=y) && EXPERIMENTAL
+       depends on EXPERIMENTAL
        ---help---
        Saying Y here will enable generic SG (SCSI generic) v4 support
        for any block device.
@@ -64,4 +62,11 @@ config BLK_DEV_BSG
        protocols (e.g. Task Management Functions and SMP in Serial
        Attached SCSI).
 
+endif # BLOCK
+
+config BLOCK_COMPAT
+       bool
+       depends on BLOCK && COMPAT
+       default y
+
 source block/Kconfig.iosched