From: Albert H. <he...@us...> - 2006-06-21 18:56:44
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/drivers/block Modified Files: Kconfig Makefile Log Message: Merged 2.6.17. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Kconfig 24 Mar 2006 21:45:18 -0000 1.21 +++ Kconfig 21 Jun 2006 18:56:06 -0000 1.22 @@ -445,8 +445,9 @@ 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" + 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 @@ -462,14 +463,16 @@ 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 - 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 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile 18 Jan 2006 23:41:52 -0000 1.13 +++ Makefile 21 Jun 2006 18:56:06 -0000 1.14 @@ -7,7 +7,6 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o -obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o obj-$(CONFIG_BLK_DEV_SWIM_IOP) += swim_iop.o |