upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index a1d5024..991543f 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -308,6 +308,8 @@ config BLK_DEV_UB
          This driver supports certain USB attached storage devices
          such as flash keys.
 
+         Warning: Enabling this cripples the usb-storage driver.
+
          If unsure, say N.
 
 config BLK_DEV_RAM
@@ -329,6 +331,14 @@ config BLK_DEV_RAM
          Most normal users won't need the RAM disk functionality, and can
          thus say N here.
 
+config BLK_DEV_RAM_COUNT
+       int "Default number of RAM disks" if BLK_DEV_RAM
+       default "16"
+       help
+         The default value is 16 RAM disks. Change this if you know what
+         are doing. If you boot from a filesystem that needs to be extracted
+         in memory, you will need at least one RAM disk (e.g. root on cramfs).
+
 config BLK_DEV_RAM_SIZE
        int "Default RAM disk size (kbytes)"
        depends on BLK_DEV_RAM
@@ -348,6 +358,32 @@ config BLK_DEV_INITRD
          "real" root file system, etc. See <file:Documentation/initrd.txt>
          for details.
 
+config INITRAMFS_SOURCE
+       string "Source directory of cpio_list"
+       default ""
+       help
+         This can be set to either a directory containing files, etc to be
+         included in the initramfs archive, or a file containing newline
+         separated entries.
+
+         If it is a file, it should be in the following format:
+           # a comment
+           file <name> <location> <mode> <uid> <gid>
+           dir <name> <mode> <uid> <gid>
+           nod <name> <mode> <uid> <gid> <dev_type> <maj> <min>
+
+         Where:
+           <name>      name of the file/dir/nod in the archive
+           <location>  location of the file in the current filesystem
+           <mode>      mode/permissions of the file
+           <uid>       user id (0=root)
+           <gid>       group id (0=root)
+           <dev_type>  device type (b=block, c=character)
+           <maj>       major number of nod
+           <min>       minor number of nod
+
+         If you are not sure, leave it blank.
+
 config LBD
        bool "Support for Large Block Devices"
        depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH
@@ -356,6 +392,46 @@ config LBD
          your machine, or if you want to have a raid or loopback device
          bigger than 2TB.  Otherwise say N.
 
+config CDROM_PKTCDVD
+       tristate "Packet writing on CD/DVD media"
+       help
+         If you have a CDROM drive that supports packet writing, say Y to
+         include preliminary support. It should work with any MMC/Mt Fuji
+         compliant ATAPI or SCSI drive, which is just about any newer CD
+         writer.
+
+         Currently only writing to CD-RW, DVD-RW and DVD+RW discs is possible.
+         DVD-RW disks must be in restricted overwrite mode.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pktcdvd.
+
+config CDROM_PKTCDVD_BUFFERS
+       int "Free buffers for data gathering"
+       depends on CDROM_PKTCDVD
+       default "8"
+       help
+         This controls the maximum number of active concurrent packets. More
+         concurrent packets can increase write performance, but also require
+         more memory. Each concurrent packet will require approximately 64Kb
+         of non-swappable kernel memory, memory which will be allocated at
+         pktsetup time.
+
+config CDROM_PKTCDVD_WCACHE
+       bool "Enable write caching"
+       depends on CDROM_PKTCDVD
+       help
+         If enabled, write caching will be set for the CD-R/W device. For now
+         this option is dangerous unless the CD-RW media is known good, as we
+         don't do deferred write error handling yet.
+
+config DISKDUMP
+       tristate "Disk dump support"
+       ---help---
+         Disk dump support.
+
 source "drivers/s390/block/Kconfig"
 
+source "drivers/block/Kconfig.iosched"
+
 endmenu