diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
| commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
| tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /arch/mips/lasat/setup.c | |
| parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
| parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) | |
Merge branch 'viro'
Diffstat (limited to 'arch/mips/lasat/setup.c')
| -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 dcd819d57dae..83eb08b7a072 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
| @@ -134,8 +134,8 @@ void __init serial_init(void) | |||
| 134 | 134 | ||
| 135 | memset(&s, 0, sizeof(s)); | 135 | memset(&s, 0, sizeof(s)); |
| 136 | 136 | ||
| 137 | s.flags = STD_COM_FLAGS; | 137 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
| 138 | s.iotype = SERIAL_IO_MEM; | 138 | s.iotype = UPIO_MEM; |
| 139 | 139 | ||
| 140 | if (mips_machtype == MACH_LASAT_100) { | 140 | if (mips_machtype == MACH_LASAT_100) { |
| 141 | s.uartclk = LASAT_BASE_BAUD_100 * 16; | 141 | s.uartclk = LASAT_BASE_BAUD_100 * 16; |