diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 10:56:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 10:56:34 -0800 |
| commit | 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 (patch) | |
| tree | cc380ac53a720a905232463cd8fed9cb27875723 /arch/mips/au1000/common/setup.c | |
| parent | cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f (diff) | |
| parent | aec8b7557cf0fc4dac059112328b5aa89271c77e (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/au1000/common/setup.c')
| -rw-r--r-- | arch/mips/au1000/common/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index 4f21f42d096..08c8c855cc9 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c @@ -93,7 +93,7 @@ void __init plat_setup(void) argptr = prom_getcmdline(); -#ifdef CONFIG_SERIAL_AU1X00_CONSOLE +#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) if ((argptr = strstr(argptr, "console=")) == NULL) { argptr = prom_getcmdline(); strcat(argptr, " console=ttyS0,115200"); |