From a5467cdd9ad959723b195bea8f142c92f039f888 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 19 Mar 2006 12:46:55 -0800 Subject: [PATCH] --- yaml --- r: 21563 b: refs/heads/master c: 467418f3508b426adbc7df795ebf3baaed4fbefc h: refs/heads/master i: 21561: c9d96b5afc1fed25f9601a978a48aaef8e8e76df 21559: 35bae16b419c5855c1860caa962bc09af5ad30aa v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ae53a2c95ff..86323ad24328 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb8646d8340fa7c1b66a037428e39f85f8738f0a +refs/heads/master: 467418f3508b426adbc7df795ebf3baaed4fbefc diff --git a/trunk/arch/sparc64/kernel/setup.c b/trunk/arch/sparc64/kernel/setup.c index 7ae4027a9192..7d0e67c1ce50 100644 --- a/trunk/arch/sparc64/kernel/setup.c +++ b/trunk/arch/sparc64/kernel/setup.c @@ -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);