From e11612c742b643e8fb5f1cff2c74e40003325726 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 22 Jun 2006 14:47:14 -0700
Subject: [PATCH] --- yaml --- r: 28559 b: refs/heads/master c:
 5d2170ad1092b2940138dc3ae4a944d7bf87ae9e h: refs/heads/master i:   28557:
 d6751b066853b850fec4400b463fefbe2c31f53e   28555:
 6a8ba0fcb5452f42c7fb3d141a9235d6a5bd4ab2   28551:
 ff5144428ca33312372a91b14e0699738c5f8895   28543:
 027412a93900d26f4ada50faf461d0d8c5d63ca5 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sparc/kernel/setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 33985ed3efb9..c72c15bdb3aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f98a44b9d09580036da7e7f8b33e66f411cf374
+refs/heads/master: 5d2170ad1092b2940138dc3ae4a944d7bf87ae9e
diff --git a/trunk/arch/sparc/kernel/setup.c b/trunk/arch/sparc/kernel/setup.c
index 2cbf282f0d00..a893a9cc9534 100644
--- a/trunk/arch/sparc/kernel/setup.c
+++ b/trunk/arch/sparc/kernel/setup.c
@@ -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);