Commit 5d2170ad authored Jun 22, 2006 by Al Viro Committed by Linus Torvalds Jun 22, 2006

[PATCH] sparc build breakage

rd_prompt et.al.  depend on CONFIG_BLK_DEV_RAM, not CONFIG_BLK_INITRD; now
that those are independent, setup.c blows with INITRD on and BLK_DEV_RAM
off.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: William Lee Irwin III <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 7f98a44b

arch/sparc/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -332,7 +332,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);