From 30d114359f6380c0aa0d4a222fa6259c19fd1d92 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 2 Jun 2009 19:05:28 +0100
Subject: [PATCH] --- yaml --- r: 145545 b: refs/heads/master c:
 e082f188f774544bc2c2edf51176157503c98fe4 h: refs/heads/master i:   145543:
 8986ee7429b6897e5835bfc6e40c81323ae317d7 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/mips/sibyte/cfe/setup.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6bb3cc8d257d..41ccb13b326d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e36b80b658d471be5a8a40f00e2c7614524b86a2
+refs/heads/master: e082f188f774544bc2c2edf51176157503c98fe4
diff --git a/trunk/arch/mips/sibyte/cfe/setup.c b/trunk/arch/mips/sibyte/cfe/setup.c
index 3de30f79db3f..eb5396cf81bb 100644
--- a/trunk/arch/mips/sibyte/cfe/setup.c
+++ b/trunk/arch/mips/sibyte/cfe/setup.c
@@ -288,13 +288,7 @@ void __init prom_init(void)
 	 */
 	cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
 	if (cfe_getenv("LINUX_CMDLINE", arcs_cmdline, CL_SIZE) < 0) {
-		if (argc < 0) {
-			/*
-			 * It's OK for direct boot to not provide a
-			 *  command line
-			 */
-			strcpy(arcs_cmdline, "root=/dev/ram0 ");
-		} else {
+		if (argc >= 0) {
 			/* The loader should have set the command line */
 			/* too early for panic to do any good */
 			printk("LINUX_CMDLINE not defined in cfe.");