From 6210f68d1ffb706dd937e144b55588055e95add0 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Sun, 7 Nov 2010 13:38:29 +0100 Subject: [PATCH] --- yaml --- r: 234142 b: refs/heads/master c: 597c6740185c44686b5476a251eb53a13f685ae9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/loongson/common/cmdline.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d842a0a7ba8c..a311c19057ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e56293b129607be089f2c12906d709e3c84b68c4 +refs/heads/master: 597c6740185c44686b5476a251eb53a13f685ae9 diff --git a/trunk/arch/mips/loongson/common/cmdline.c b/trunk/arch/mips/loongson/common/cmdline.c index 1a06defc4f7f..353e1d2e41a5 100644 --- a/trunk/arch/mips/loongson/common/cmdline.c +++ b/trunk/arch/mips/loongson/common/cmdline.c @@ -44,10 +44,5 @@ void __init prom_init_cmdline(void) strcat(arcs_cmdline, " "); } - if ((strstr(arcs_cmdline, "console=")) == NULL) - strcat(arcs_cmdline, " console=ttyS0,115200"); - if ((strstr(arcs_cmdline, "root=")) == NULL) - strcat(arcs_cmdline, " root=/dev/hda1"); - prom_init_machtype(); }