summaryrefslogtreecommitdiffstats
path: root/arch/mips/momentum
diff options
context:
space:
mode:
authorLinus Torvalds2006-02-09 00:21:22 +0100
committerLinus Torvalds2006-02-09 00:21:22 +0100
commit17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch)
tree8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/mips/momentum
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[SERIAL] 8250_pci: add new PCI serial card support (diff)
downloadkernel-qcow2-linux-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.gz
kernel-qcow2-linux-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.xz
kernel-qcow2-linux-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/mips/momentum')
-rw-r--r--arch/mips/momentum/jaguar_atx/ja-console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/momentum/jaguar_atx/ja-console.c b/arch/mips/momentum/jaguar_atx/ja-console.c
index da6e1ed34db1..2292d0ec47fc 100644
--- a/arch/mips/momentum/jaguar_atx/ja-console.c
+++ b/arch/mips/momentum/jaguar_atx/ja-console.c
@@ -93,7 +93,7 @@ static void inline ja_console_probe(void)
up.uartclk = JAGUAR_ATX_UART_CLK;
up.regshift = 2;
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))