diff options
-rw-r--r-- | drivers/block/Kconfig | 16 | ||||
-rw-r--r-- | init/Kconfig | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index cacb1c816e35..17ee97f3a99b 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
@@ -406,22 +406,6 @@ config BLK_DEV_RAM_BLOCKSIZE | |||
406 | setups function - apparently needed by the rd_load_image routine | 406 | setups function - apparently needed by the rd_load_image routine |
407 | that supposes the filesystem in the image uses a 1024 blocksize. | 407 | that supposes the filesystem in the image uses a 1024 blocksize. |
408 | 408 | ||
409 | config BLK_DEV_INITRD | ||
410 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" | ||
411 | depends on BROKEN || !FRV | ||
412 | help | ||
413 | The initial RAM filesystem is a ramfs which is loaded by the | ||
414 | boot loader (loadlin or lilo) and that is mounted as root | ||
415 | before the normal boot procedure. It is typically used to | ||
416 | load modules needed to mount the "real" root file system, | ||
417 | etc. See <file:Documentation/initrd.txt> for details. | ||
418 | |||
419 | If RAM disk support (BLK_DEV_RAM) is also included, this | ||
420 | also enables initial RAM disk (initrd) support and adds | ||
421 | 15 Kbytes (more on some other architectures) to the kernel size. | ||
422 | |||
423 | If unsure say Y. | ||
424 | |||
425 | config CDROM_PKTCDVD | 409 | config CDROM_PKTCDVD |
426 | tristate "Packet writing on CD/DVD media" | 410 | tristate "Packet writing on CD/DVD media" |
427 | depends on !UML | 411 | depends on !UML |
diff --git a/init/Kconfig b/init/Kconfig index f977086e118a..b170aa1d43bd 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -304,6 +304,22 @@ config RELAY | |||
304 | 304 | ||
305 | If unsure, say N. | 305 | If unsure, say N. |
306 | 306 | ||
307 | config BLK_DEV_INITRD | ||
308 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" | ||
309 | depends on BROKEN || !FRV | ||
310 | help | ||
311 | The initial RAM filesystem is a ramfs which is loaded by the | ||
312 | boot loader (loadlin or lilo) and that is mounted as root | ||
313 | before the normal boot procedure. It is typically used to | ||
314 | load modules needed to mount the "real" root file system, | ||
315 | etc. See <file:Documentation/initrd.txt> for details. | ||
316 | |||
317 | If RAM disk support (BLK_DEV_RAM) is also included, this | ||
318 | also enables initial RAM disk (initrd) support and adds | ||
319 | 15 Kbytes (more on some other architectures) to the kernel size. | ||
320 | |||
321 | If unsure say Y. | ||
322 | |||
307 | if BLK_DEV_INITRD | 323 | if BLK_DEV_INITRD |
308 | 324 | ||
309 | source "usr/Kconfig" | 325 | source "usr/Kconfig" |