summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-03-26 01:37:36 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 08:56:58 -0800
commit1751ace034bba6b423c1de4668f0e65cc9ef2b84 (patch)
tree3547409d6f919a459e3d79b02ff0903235b31616
parent5ff2a7e25ddd648e9096d45cdc5e7d656a8bb0ff (diff)
downloadlinux-stable-1751ace034bba6b423c1de4668f0e65cc9ef2b84.tar.gz
linux-stable-1751ace034bba6b423c1de4668f0e65cc9ef2b84.tar.bz2
linux-stable-1751ace034bba6b423c1de4668f0e65cc9ef2b84.zip
[PATCH] Update documentation for BLK_DEV_INITRD to match current usage
Cc: Al Viro <viro@ftp.linux.org.uk> Cc: Christoph Hellwig <hch@lst.de> Cc: Zdenek Pavlas <pavlas@nextra.cz> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/block/Kconfig15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e57ac5a43246..875ae7699025 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -400,13 +400,16 @@ config BLK_DEV_RAM_SIZE
8192.
config BLK_DEV_INITRD
- bool "Initial RAM disk (initrd) support"
+ bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
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