diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 09:22:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 09:22:53 -0700 |
| commit | 46056be71c37378f518711da651e4bb76d650ee9 (patch) | |
| tree | 63c563bc3b84f22b517114ebb101b991958228a4 /arch/mips/sibyte/cfe/setup.c | |
| parent | 5284c6b99ea017f73c09b50f34a637ff9d5d26a0 (diff) | |
| parent | 5636919b5c909fee54a6ef5226475ecae012ad02 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Outline udelay and fix a few issues.
MIPS: ioctl.h: Fix headers_check warnings
MIPS: Cobalt: PCI bus is always required to obtain the board ID
MIPS: Kconfig: Remove "Support for" from Cavium system type
MIPS: Sibyte: Honor CONFIG_CMDLINE
SSB: BCM47xx: Export ssb_watchdog_timer_set
Diffstat (limited to 'arch/mips/sibyte/cfe/setup.c')
| -rw-r--r-- | arch/mips/sibyte/cfe/setup.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c index 3de30f79db3..eb5396cf81b 100644 --- a/arch/mips/sibyte/cfe/setup.c +++ b/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."); |