X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2FKconfig;h=9bda7bc80307f2a69c06a0c46819c0a10d5321e2;hb=bdbea34ddd2e52dc73f03e7ef7197d4c0da400d6;hp=b6f5f0a79655a3de0125af945682f91bf92bc726;hpb=76467874b83835129dc454e3a7a8e5d1186101b0;p=linux-2.6-omap-h63xx.git

diff --git a/block/Kconfig b/block/Kconfig
index b6f5f0a7965..9bda7bc8030 100644
--- 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.
+menuconfig 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
@@ -26,11 +42,31 @@ 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.
 
+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 BLOCK_COMPAT
+	bool
+	depends on BLOCK && COMPAT
+	default y
+
 source block/Kconfig.iosched