Эх сурвалжийг харах

[SPARC64]: CONFIG_BLK_DEV_RAM fix

init/do_mounts_rd.c depends upon CONFIG_BLK_DEV_RAM, not CONFIG_BLK_DEV_INITRD.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Andrew Morton 19 жил өмнө
parent
commit
467418f350

+ 1 - 1
arch/sparc64/kernel/setup.c

@@ -349,7 +349,7 @@ void __init setup_arch(char **cmdline_p)
 	if (!root_flags)
 	if (!root_flags)
 		root_mountflags &= ~MS_RDONLY;
 		root_mountflags &= ~MS_RDONLY;
 	ROOT_DEV = old_decode_dev(root_dev);
 	ROOT_DEV = old_decode_dev(root_dev);
-#ifdef CONFIG_BLK_DEV_INITRD
+#ifdef CONFIG_BLK_DEV_RAM
 	rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
 	rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
 	rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
 	rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
 	rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);	
 	rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);