[SPARC64]: CONFIG_BLK_DEV_RAM fix
authorAndrew Morton <akpm@osdl.org>
Sun, 19 Mar 2006 20:46:55 +0000 (12:46 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 20 Mar 2006 09:16:41 +0000 (01:16 -0800)
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>
arch/sparc64/kernel/setup.c

index 7ae4027a919225c62bf320613a78e869f4826c49..7d0e67c1ce5099102dce96928a2b3ae3b119ef57 100644 (file)
@@ -349,7 +349,7 @@ void __init setup_arch(char **cmdline_p)
        if (!root_flags)
                root_mountflags &= ~MS_RDONLY;
        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_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
        rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);