aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/cobalt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 18:21:22 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 18:21:22 -0500
commit17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch)
tree8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/mips/cobalt
parentcce0cac125623f9b68f25dd1350f6d616220a8dd (diff)
parent85d1494e5ff8e20a52ce514584ffda4f0265025e (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/mips/cobalt')
-rw-r--r--arch/mips/cobalt/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index 050685b87a3c..b9713a723053 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -140,7 +140,7 @@ void __init plat_setup(void)
140 uart.type = PORT_UNKNOWN; 140 uart.type = PORT_UNKNOWN;
141 uart.uartclk = 18432000; 141 uart.uartclk = 18432000;
142 uart.irq = COBALT_SERIAL_IRQ; 142 uart.irq = COBALT_SERIAL_IRQ;
143 uart.flags = STD_COM_FLAGS; 143 uart.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
144 uart.iobase = 0xc800000; 144 uart.iobase = 0xc800000;
145 uart.iotype = UPIO_PORT; 145 uart.iotype = UPIO_PORT;
146 146