linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 74f8314..3e1f17f 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -390,9 +390,8 @@ config BLK_DEV_RAM
          thus say N here.
 
 config BLK_DEV_RAM_COUNT
-       int "Default number of RAM disks"
+       int "Default number of RAM disks" if BLK_DEV_RAM
        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
@@ -407,28 +406,15 @@ config BLK_DEV_RAM_SIZE
          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 kilobytes.  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
-       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
-       depends on BROKEN || !FRV
+       bool "Initial RAM disk (initrd) support"
+       depends on BLK_DEV_RAM=y
        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.
+         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 CDROM_PKTCDVD