[Bluetooth] Always include MTU in L2CAP config responses

[pandora-kernel.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 377f6dd..83766a6 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -1,6 +1,24 @@
 #
 # Block layer core configuration
 #
+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
+
 #XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
 #for instance.
 config LBD
@@ -11,4 +29,28 @@ config LBD
          your machine, or if you want to have a raid or loopback device
          bigger than 2TB.  Otherwise say N.
 
+config BLK_DEV_IO_TRACE
+       bool "Support for tracing block io actions"
+       depends on SYSFS
+       select RELAY
+       select DEBUG_FS
+       help
+         Say Y here, if you want to be able to trace the block layer actions
+         on a given queue. Tracing allows you to see any traffic happening
+         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
+
+config LSF
+       bool "Support for Large Single Files"
+       depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
+       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