Merge master.kernel.org:/home/rmk/linux-2.6-serial

[powerpc.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 7b1cd93..ae0949b 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -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


@@ -358,7 +358,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.
 


@@ -382,8 +383,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


@@ -399,14 +401,16 @@ 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
+       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"

        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.
+         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
 
 
 config CDROM_PKTCDVD


@@ -432,12 +436,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