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 83766a6bdee264f3c3a8da74bfa95ada55097062..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
@@ -19,11 +19,9 @@ config BLOCK
 
 if BLOCK
 
-#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
-#for instance.
 config LBD
        bool "Support for Large Block Devices"
-       depends on X86 || (MIPS && 32BIT) || PPC32 || (S390 && !64BIT) || SUPERH || UML
+       depends on !64BIT
        help
          Say Y here if you want to attach large (bigger than 2TB) discs to
          your machine, or if you want to have a raid or loopback device
@@ -44,13 +42,21 @@ config BLK_DEV_IO_TRACE
 
 config LSF
        bool "Support for Large Single Files"
-       depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
+       depends on !64BIT
        help
          Say Y here if you want to be able to handle very large files (bigger
          than 2TB), otherwise say N.
 
          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