diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/mips/au1000/common/setup.c | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/mips/au1000/common/setup.c')
| -rw-r--r-- | arch/mips/au1000/common/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index eb155c071aa6..307e98c29ddc 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
| @@ -90,11 +90,11 @@ void __init plat_setup(void) | |||
| 90 | else { | 90 | else { |
| 91 | /* Clear to obtain best system bus performance */ | 91 | /* Clear to obtain best system bus performance */ |
| 92 | clear_c0_config(1<<19); /* Clear Config[OD] */ | 92 | clear_c0_config(1<<19); /* Clear Config[OD] */ |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | argptr = prom_getcmdline(); | 95 | argptr = prom_getcmdline(); |
| 96 | 96 | ||
| 97 | #if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) | 97 | #ifdef CONFIG_SERIAL_8250_CONSOLE |
| 98 | if ((argptr = strstr(argptr, "console=")) == NULL) { | 98 | if ((argptr = strstr(argptr, "console=")) == NULL) { |
| 99 | argptr = prom_getcmdline(); | 99 | argptr = prom_getcmdline(); |
| 100 | strcat(argptr, " console=ttyS0,115200"); | 100 | strcat(argptr, " console=ttyS0,115200"); |