diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:21:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:21:22 -0800 |
| commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
| tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/mips/lasat | |
| parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
| parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) | |
| download | linux-3.10-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.gz linux-3.10-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.bz2 linux-3.10-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/mips/lasat')
| -rw-r--r-- | arch/mips/lasat/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index dcd819d57da..83eb08b7a07 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c @@ -134,8 +134,8 @@ void __init serial_init(void) memset(&s, 0, sizeof(s)); - s.flags = STD_COM_FLAGS; - s.iotype = SERIAL_IO_MEM; + s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; + s.iotype = UPIO_MEM; if (mips_machtype == MACH_LASAT_100) { s.uartclk = LASAT_BASE_BAUD_100 * 16; |