pvr2fb: Fix oops when pseudo_palette is written

[safe/jmp/linux-2.6] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 43ca070..2484e0e 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.
+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
@@ -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
@@ -25,11 +42,26 @@ config BLK_DEV_IO_TRACE
 
 config LSF
        bool "Support for Large Single Files"
-       depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
-       default n
+       depends on !64BIT
        help
-         When CONFIG_LBD is disabled, say Y here if you want to
-         handle large file(bigger than 2TB), otherwise say N.
-         When CONFIG_LBD is enabled, Y is set automatically.
+         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
 
 source block/Kconfig.iosched