diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-06-22 17:47:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 18:05:55 -0400 |
| commit | 5d2170ad1092b2940138dc3ae4a944d7bf87ae9e (patch) | |
| tree | aa06fc77266eff805b97e9f44fc35783f8f34c73 /arch | |
| parent | 7f98a44b9d09580036da7e7f8b33e66f411cf374 (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 2cbf282f0d00..a893a9cc9534 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
| @@ -332,7 +332,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 332 | if (!root_flags) | 332 | if (!root_flags) |
| 333 | root_mountflags &= ~MS_RDONLY; | 333 | root_mountflags &= ~MS_RDONLY; |
| 334 | ROOT_DEV = old_decode_dev(root_dev); | 334 | ROOT_DEV = old_decode_dev(root_dev); |
| 335 | #ifdef CONFIG_BLK_DEV_INITRD | 335 | #ifdef CONFIG_BLK_DEV_RAM |
| 336 | rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK; | 336 | rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK; |
| 337 | rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0); | 337 | rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0); |
| 338 | rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0); | 338 | rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0); |