diff options
| author | Linus Torvalds | 2006-03-28 23:52:37 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-03-28 23:52:37 +0200 |
| commit | d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9 (patch) | |
| tree | e96e7a3e02acacd4ee200592ec176b94802d11e7 /arch/mips | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff) | |
| parent | [SERIAL] Provide Cirrus EP93xx AMBA PL010 serial support. (diff) | |
| download | kernel-qcow2-linux-d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9.tar.gz kernel-qcow2-linux-d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9.tar.xz kernel-qcow2-linux-d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Provide Cirrus EP93xx AMBA PL010 serial support.
[SERIAL] amba-pl010: allow platforms to specify modem control method
[SERIAL] Remove obsoleted au1x00_uart driver
[SERIAL] Small time UART configuration fix for AU1100 processor
Diffstat (limited to 'arch/mips')
| -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 1080558c8100..307e98c29ddc 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c @@ -94,7 +94,7 @@ void __init plat_setup(void) argptr = prom_getcmdline(); -#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) +#ifdef CONFIG_SERIAL_8250_CONSOLE if ((argptr = strstr(argptr, "console=")) == NULL) { argptr = prom_getcmdline(); strcat(argptr, " console=ttyS0,115200"); |