Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 176df50..2254b38 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -6,7 +6,7 @@ menu "Block devices"
 
 config BLK_DEV_FD
        tristate "Normal floppy disk support"
 
 config BLK_DEV_FD
        tristate "Normal floppy disk support"

-       depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285
+       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


@@ -117,7 +117,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


@@ -317,6 +317,7 @@ config BLK_DEV_CRYPTOLOOP
 
 config BLK_DEV_VROOT
        tristate "Virtual Root device support"
 
 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.
        ---help---
          Saying Y here will allow you to use quota/fs ioctls on a shared
          partition within a virtual server without compromising security.


@@ -364,7 +365,8 @@ 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.
 

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

 
          If unsure, say N.
 
 
          If unsure, say N.
 


@@ -388,8 +390,9 @@ config BLK_DEV_RAM
          thus say N here.
 
 config BLK_DEV_RAM_COUNT
          thus say N here.
 
 config BLK_DEV_RAM_COUNT

-       int "Default number of RAM disks" if BLK_DEV_RAM
+       int "Default number of RAM disks"

        default "16"
        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
        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


@@ -405,67 +408,17 @@ config BLK_DEV_RAM_SIZE
          8192.
 
 config BLK_DEV_INITRD
          8192.
 
 config BLK_DEV_INITRD

-       bool "Initial RAM disk (initrd) support"
-       depends on BLK_DEV_RAM=y
-       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 INITRAMFS_SOURCE
-       string "Initramfs source file(s)"
-       default ""
+       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"

        help
        help

-         This can be either a single cpio archive with a .cpio suffix or a
-         space-separated list of directories and files for building the
-         initramfs image.  A cpio archive should contain a filesystem archive
-         to be used as an initramfs image.  Directories should contain a
-         filesystem layout to be included in the initramfs image.  Files
-         should contain entries according to the format described by the
-         "usr/gen_init_cpio" program in the kernel tree.
-
-         When multiple directories and files are specified then the
-         initramfs image will be the aggregate of all of them.
+         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.

 
 

-         See <file:Documentation/early-userspace/README for more details.
-
-         If you are not sure, leave it blank.
-
-config INITRAMFS_ROOT_UID
-       int "User ID to map to 0 (user root)"
-       depends on INITRAMFS_SOURCE!=""
-       default "0"
-       help
-         This setting is only meaningful if the INITRAMFS_SOURCE is
-         contains a directory.  Setting this user ID (UID) to something
-         other than "0" will cause all files owned by that UID to be
-         owned by user root in the initial ramdisk image.
+         If RAM disk support (BLK_DEV_RAM) is also included, this
+         also enables initial RAM disk (initrd) support.

 
 

-         If you are not sure, leave it set to "0".
-
-config INITRAMFS_ROOT_GID
-       int "Group ID to map to 0 (group root)"
-       depends on INITRAMFS_SOURCE!=""
-       default "0"
-       help
-         This setting is only meaningful if the INITRAMFS_SOURCE is
-         contains a directory.  Setting this group ID (GID) to something
-         other than "0" will cause all files owned by that GID to be
-         owned by group root in the initial ramdisk image.
-
-         If you are not sure, leave it set to "0".
-
-#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
-#for instance.
-config LBD
-       bool "Support for Large Block Devices"
-       depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH || UML
-       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.

 
 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media"
 
 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media"


@@ -490,12 +443,12 @@ config CDROM_PKTCDVD_BUFFERS
          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
          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.
+         of non-swappable kernel memory, memory which will be allocated when
+         a disc is opened for writing.

 
 config CDROM_PKTCDVD_WCACHE
 
 config CDROM_PKTCDVD_WCACHE

-       bool "Enable write caching"
-       depends on CDROM_PKTCDVD
+       bool "Enable write caching (EXPERIMENTAL)"
+       depends on CDROM_PKTCDVD && EXPERIMENTAL

        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
        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


@@ -503,8 +456,6 @@ config CDROM_PKTCDVD_WCACHE
 
 source "drivers/s390/block/Kconfig"
 
 
 source "drivers/s390/block/Kconfig"
 

-source "drivers/block/Kconfig.iosched"
-

 config ATA_OVER_ETH
        tristate "ATA over Ethernet support"
        depends on NET
 config ATA_OVER_ETH
        tristate "ATA over Ethernet support"
        depends on NET