fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index a1d5024..db1def8 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -2,11 +2,13 @@
 # Block device driver configuration
 #
 
 # Block device driver configuration
 #
 

+if BLOCK
+

 menu "Block devices"
 
 config BLK_DEV_FD
        tristate "Normal floppy disk support"
 menu "Block devices"
 
 config BLK_DEV_FD
        tristate "Normal floppy disk support"

-       depends on (!ARCH_S390 && !M68K && !IA64) || Q40 || (SUN3X && BROKEN)
+       depends on ARCH_MAY_HAVE_PC_FDC

        ---help---
          If you want to use the floppy disk drive(s) of your PC under Linux,
          say Y. Information about this driver, especially important for IBM
        ---help---
          If you want to use the floppy disk drive(s) of your PC under Linux,
          say Y. Information about this driver, especially important for IBM


@@ -26,13 +28,6 @@ config ATARI_FLOPPY
        tristate "Atari floppy support"
        depends on ATARI
 
        tristate "Atari floppy support"
        depends on ATARI
 

-config BLK_DEV_SWIM_IOP
-       bool "Macintosh IIfx/Quadra 900/Quadra 950 floppy support (EXPERIMENTAL)"
-       depends on MAC && EXPERIMENTAL && BROKEN
-       help
-         Say Y here to support the SWIM (Super Woz Integrated Machine) IOP
-         floppy controller on the Macintosh IIfx and Quadra 900/950.
-

 config MAC_FLOPPY
        tristate "Support for PowerMac floppy"
        depends on PPC_PMAC && !PPC_PMAC64
 config MAC_FLOPPY
        tristate "Support for PowerMac floppy"
        depends on PPC_PMAC && !PPC_PMAC64


@@ -42,7 +37,7 @@ config MAC_FLOPPY
 
 config BLK_DEV_PS2
        tristate "PS/2 ESDI hard disk support"
 
 config BLK_DEV_PS2
        tristate "PS/2 ESDI hard disk support"

-       depends on MCA && MCA_LEGACY
+       depends on MCA && MCA_LEGACY && BROKEN

        help
          Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
          hard disk.
        help
          Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
          hard disk.


@@ -105,7 +100,7 @@ config ATARI_SLM
 
 config BLK_DEV_XD
        tristate "XT hard disk support"
 
 config BLK_DEV_XD
        tristate "XT hard disk support"

-       depends on ISA
+       depends on ISA && ISA_DMA_API

        help
          Very old 8 bit hard disk controllers used in the IBM XT computer
          will be supported if you say Y here.
        help
          Very old 8 bit hard disk controllers used in the IBM XT computer
          will be supported if you say Y here.


@@ -117,7 +112,7 @@ config BLK_DEV_XD
 
 config PARIDE
        tristate "Parallel port IDE device support"
 
 config PARIDE
        tristate "Parallel port IDE device support"

-       depends on PARPORT
+       depends on PARPORT_PC

        ---help---
          There are many external CD-ROM and disk devices that connect through
          your computer's parallel port. Most of them are actually IDE devices
        ---help---
          There are many external CD-ROM and disk devices that connect through
          your computer's parallel port. Most of them are actually IDE devices


@@ -166,11 +161,12 @@ config BLK_CPQ_CISS_DA
 
 config CISS_SCSI_TAPE
        bool "SCSI tape drive support for Smart Array 5xxx"
 
 config CISS_SCSI_TAPE
        bool "SCSI tape drive support for Smart Array 5xxx"

-       depends on BLK_CPQ_CISS_DA && SCSI && PROC_FS
+       depends on BLK_CPQ_CISS_DA && PROC_FS
+       depends on SCSI=y || SCSI=BLK_CPQ_CISS_DA

        help
          When enabled (Y), this option allows SCSI tape drives and SCSI medium
          changers (tape robots) to be accessed via a Compaq 5xxx array 
        help
          When enabled (Y), this option allows SCSI tape drives and SCSI medium
          changers (tape robots) to be accessed via a Compaq 5xxx array 

-         controller.  (See Documentation/cciss.txt for more details.)
+         controller.  (See <file:Documentation/cciss.txt> for more details.)

 
          "SCSI support" and "SCSI tape support" must also be enabled for this 
          option to work.
 
          "SCSI support" and "SCSI tape support" must also be enabled for this 
          option to work.


@@ -196,7 +192,7 @@ config BLK_DEV_UMEM
        ---help---
          Saying Y here will include support for the MM5415 family of
          battery backed (Non-volatile) RAM cards.
        ---help---
          Saying Y here will include support for the MM5415 family of
          battery backed (Non-volatile) RAM cards.

-         http://www.umem.com/
+         <http://www.umem.com/>

 
          The cards appear as block devices that can be partitioned into
          as many as 15 partitions.
 
          The cards appear as block devices that can be partitioned into
          as many as 15 partitions.


@@ -205,8 +201,57 @@ config BLK_DEV_UMEM
          module will be called umem.
 
          The umem driver has not yet been allocated a MAJOR number, so
          module will be called umem.
 
          The umem driver has not yet been allocated a MAJOR number, so

-         one is chosen dynamically.  Use "devfs" or look in /proc/devices
-         for the device number
+         one is chosen dynamically.
+
+config BLK_DEV_UBD
+       bool "Virtual block device"
+       depends on UML
+       ---help---
+          The User-Mode Linux port includes a driver called UBD which will let
+          you access arbitrary files on the host computer as block devices.
+          Unless you know that you do not need such virtual block devices say
+          Y here.
+
+config BLK_DEV_UBD_SYNC
+       bool "Always do synchronous disk IO for UBD"
+       depends on BLK_DEV_UBD
+       ---help---
+         Writes to the virtual block device are not immediately written to the
+         host's disk; this may cause problems if, for example, the User-Mode
+         Linux 'Virtual Machine' uses a journalling filesystem and the host
+         computer crashes.
+
+          Synchronous operation (i.e. always writing data to the host's disk
+          immediately) is configurable on a per-UBD basis by using a special
+          kernel command line option.  Alternatively, you can say Y here to
+          turn on synchronous operation by default for all block devices.
+
+          If you're running a journalling file system (like reiserfs, for
+          example) in your virtual machine, you will want to say Y here.  If
+          you care for the safety of the data in your virtual machine, Y is a
+          wise choice too.  In all other cases (for example, if you're just
+          playing around with User-Mode Linux) you can choose N.
+
+config BLK_DEV_COW_COMMON
+       bool
+       default BLK_DEV_UBD
+
+config MMAPPER
+       tristate "Example IO memory driver (BROKEN)"
+       depends on UML && BROKEN
+       ---help---
+          The User-Mode Linux port can provide support for IO Memory
+          emulation with this option.  This allows a host file to be
+          specified as an I/O region on the kernel command line. That file
+          will be mapped into UML's kernel address space where a driver can
+          locate it and do whatever it wants with the memory, including
+          providing an interface to it for UML processes to use.
+
+          For more information, see
+          <http://user-mode-linux.sourceforge.net/iomem.html>.
+
+          If you'd like to be able to provide a simulated IO port space for
+          User-Mode Linux processes, say Y.  If unsure, say N.

 
 config BLK_DEV_LOOP
        tristate "Loopback device support"
 
 config BLK_DEV_LOOP
        tristate "Loopback device support"


@@ -254,6 +299,7 @@ config BLK_DEV_LOOP
 config BLK_DEV_CRYPTOLOOP
        tristate "Cryptoloop Support"
        select CRYPTO
 config BLK_DEV_CRYPTOLOOP
        tristate "Cryptoloop Support"
        select CRYPTO

+       select CRYPTO_CBC

        depends on BLK_DEV_LOOP
        ---help---
          Say Y here if you want to be able to use the ciphers that are 
        depends on BLK_DEV_LOOP
        ---help---
          Say Y here if you want to be able to use the ciphers that are 


@@ -265,6 +311,13 @@ config BLK_DEV_CRYPTOLOOP
          instead, which can be configured to be on-disk compatible with the
          cryptoloop device.
 
          instead, which can be configured to be on-disk compatible with the
          cryptoloop device.
 

+config BLK_DEV_VROOT
+       tristate "Virtual Root device support"
+       depends on QUOTACTL
+       ---help---
+         Saying Y here will allow you to use quota/fs ioctls on a shared
+         partition within a virtual server without compromising security.
+

 config BLK_DEV_NBD
        tristate "Network block device support"
        depends on NET
 config BLK_DEV_NBD
        tristate "Network block device support"
        depends on NET


@@ -308,6 +361,9 @@ config BLK_DEV_UB
          This driver supports certain USB attached storage devices
          such as flash keys.
 
          This driver supports certain USB attached storage devices
          such as flash keys.
 

+         If you enable this driver, it is recommended to avoid conflicts
+         with usb-storage by enabling USB_LIBUSUAL.
+

          If unsure, say N.
 
 config BLK_DEV_RAM
          If unsure, say N.
 
 config BLK_DEV_RAM


@@ -329,6 +385,15 @@ config BLK_DEV_RAM
          Most normal users won't need the RAM disk functionality, and can
          thus say N here.
 
          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"
+       default "16"
+       depends on BLK_DEV_RAM
+       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
 config BLK_DEV_RAM_SIZE
        int "Default RAM disk size (kbytes)"
        depends on BLK_DEV_RAM


@@ -338,24 +403,77 @@ config BLK_DEV_RAM_SIZE
          what are you doing. If you are using IBM S/390, then set this to
          8192.
 
          what are you doing. If you are using IBM S/390, then set this to
          8192.
 

+config BLK_DEV_RAM_BLOCKSIZE
+       int "Default RAM disk block size (bytes)"
+       depends on BLK_DEV_RAM
+       default "1024"
+       help
+         The default value is 1024 bytes.  PAGE_SIZE is a much more
+         efficient choice however.  The default is kept to ensure initrd
+         setups function - apparently needed by the rd_load_image routine
+         that supposes the filesystem in the image uses a 1024 blocksize.
+

 config BLK_DEV_INITRD
 config BLK_DEV_INITRD

-       bool "Initial RAM disk (initrd) support"
-       depends on BLK_DEV_RAM=y
+       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+       depends on BROKEN || !FRV
+       help
+         The initial RAM filesystem is a ramfs which is loaded by the
+         boot loader (loadlin or lilo) and that is mounted as root
+         before the normal boot procedure. It is typically used to
+         load modules needed to mount the "real" root file system,
+         etc. See <file:Documentation/initrd.txt> for details.
+
+         If RAM disk support (BLK_DEV_RAM) is also included, this
+         also enables initial RAM disk (initrd) support.
+
+
+config CDROM_PKTCDVD
+       tristate "Packet writing on CD/DVD media"
+       depends on !UML
+       help
+         If you have a CDROM/DVD drive that supports packet writing, say
+         Y to include support. It should work with any MMC/Mt Fuji
+         compliant ATAPI or SCSI drive, which is just about any newer
+         DVD/CD writer.
+
+         Currently only writing to CD-RW, DVD-RW, DVD+RW and DVDRAM discs
+         is possible.
+         DVD-RW disks must be in restricted overwrite mode.
+
+         See the file <file:Documentation/cdrom/packet-writing.txt>
+         for further information on the use of this driver.
+
+         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
        help

-         The initial RAM disk is a RAM disk that is loaded by the boot loader
-         (loadlin or lilo) and that is mounted as root before the normal boot
-         procedure. It is typically used to load modules needed to mount the
-         "real" root file system, etc. See <file:Documentation/initrd.txt>
-         for details.
-
-config LBD
-       bool "Support for Large Block Devices"
-       depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH
+         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 when
+         a disc is opened for writing.
+
+config CDROM_PKTCDVD_WCACHE
+       bool "Enable write caching (EXPERIMENTAL)"
+       depends on CDROM_PKTCDVD && EXPERIMENTAL

        help
        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
-         bigger than 2TB.  Otherwise say N.
+         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.

 
 source "drivers/s390/block/Kconfig"
 
 
 source "drivers/s390/block/Kconfig"
 

+config ATA_OVER_ETH
+       tristate "ATA over Ethernet support"
+       depends on NET
+       help
+       This driver provides Support for ATA over Ethernet block
+       devices like the Coraid EtherDrive (R) Storage Blade.
+

 endmenu
 endmenu

+
+endif