Fix "delayed_work_pending()" macro expansion

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

diff --git a/block/Kconfig b/block/Kconfig
index 96783645092dc106cd4f4b300958aeae5b684e2a..a50f481116477e9552c82db45f728bc067dbbbbd 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -1,11 +1,27 @@
 #
 # Block layer core configuration
 #
-#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
-#for instance.
+config BLOCK
+       bool "Enable the block layer" if EMBEDDED
+       default y
+       help
+        This permits the block layer to be removed from the kernel if it's not
+        needed (on some embedded devices for example).  If this option is
+        disabled, then blockdev files will become unusable and some
+        filesystems (such as ext3) will become unavailable.
+
+        This option will also disable SCSI character devices and USB storage
+        since they make use of various block layer definitions and
+        facilities.
+
+        Say Y here unless you know you really don't want to mount disks and
+        suchlike.
+
+if BLOCK
+
 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
@@ -13,6 +29,7 @@ config LBD
 
 config BLK_DEV_IO_TRACE
        bool "Support for tracing block io actions"
+       depends on SYSFS
        select RELAY
        select DEBUG_FS
        help
@@ -23,4 +40,15 @@ config BLK_DEV_IO_TRACE
 
          git://brick.kernel.dk/data/git/blktrace.git
 
+config LSF
+       bool "Support for Large Single Files"
+       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
+
 source block/Kconfig.iosched