diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 00:21:22 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 00:21:22 +0100 |
commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/mips/pmc-sierra | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | [SERIAL] 8250_pci: add new PCI serial card support (diff) | |
download | linux-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.xz linux-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/mips/pmc-sierra')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c index 059755b5ed57..8bce711575de 100644 --- a/arch/mips/pmc-sierra/yosemite/setup.c +++ b/arch/mips/pmc-sierra/yosemite/setup.c @@ -185,7 +185,7 @@ static void __init py_uart_setup(void) up.uartclk = TITAN_UART_CLK; up.regshift = 0; up.iotype = UPIO_MEM; - up.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; + up.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; up.line = 0; if (early_serial_setup(&up)) |