diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
| commit | 725b2805fd5d729b0db59fe8fc992e97523782c7 (patch) | |
| tree | 04ca7c7ed6e918029898a6c5301488e60d0564d4 /arch/mips/mips-boards/sim/sim_setup.c | |
| parent | 9ac341ae799413708e674bc65c8a72c90dae8d34 (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
| download | blackbird-op-linux-725b2805fd5d729b0db59fe8fc992e97523782c7.tar.gz blackbird-op-linux-725b2805fd5d729b0db59fe8fc992e97523782c7.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/mips/mips-boards/sim/sim_setup.c')
| -rw-r--r-- | arch/mips/mips-boards/sim/sim_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c index 485d5a58d9cf..a2fd62997ca3 100644 --- a/arch/mips/mips-boards/sim/sim_setup.c +++ b/arch/mips/mips-boards/sim/sim_setup.c @@ -88,8 +88,8 @@ static void __init serial_init(void) but poll for now */ s.irq = 0; s.uartclk = BASE_BAUD * 16; - s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST; - s.iotype = SERIAL_IO_PORT | ASYNC_SKIP_TEST; + s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; + s.iotype = UPIO_PORT; s.regshift = 0; s.timeout = 4; |
