diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:13:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:13:56 -0700 |
| commit | 62b6e9ff08ced882b36c9583e350699f28912e51 (patch) | |
| tree | ceff09a936b9605011486b05aad523700202bcc4 /arch/mips/mips-boards/generic/init.c | |
| parent | 8718d75ef23e858a6b947f5b1a43094acf3b6e23 (diff) | |
| parent | 7df4246117cb0adc6c3ed54bdb2d2faf4656d9cd (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] Export except_vec_vi_{mori,lui,ori} as text symbols.
[MIPS] mips-boards: More liberal check for mips-board console
[MIPS] Misc fixes for plat_irq_dispatch functions
[MIPS] Qemu: Fix Symmetric Uniprocessor support.
[MIPS] VI: TRACE_IRQS_OFF clobbers $v0, so save & restore around call.
Diffstat (limited to 'arch/mips/mips-boards/generic/init.c')
| -rw-r--r-- | arch/mips/mips-boards/generic/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index 1acdf091c25..88e9c2a7a2f 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c @@ -145,7 +145,7 @@ static void __init console_config(void) char parity = '\0', bits = '\0', flow = '\0'; char *s; - if ((strstr(prom_getcmdline(), "console=ttyS")) == NULL) { + if ((strstr(prom_getcmdline(), "console=")) == NULL) { s = prom_getenv("modetty0"); if (s) { while (*s >= '0' && *s <= '9') |