projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/
[powerpc.git]
/
drivers
/
serial
/
pxa.c
diff --git
a/drivers/serial/pxa.c
b/drivers/serial/pxa.c
index
672b359
..
90c2a86
100644
(file)
--- a/
drivers/serial/pxa.c
+++ b/
drivers/serial/pxa.c
@@
-499,7
+499,7
@@
serial_pxa_set_termios(struct uart_port *port, struct termios *termios,
/*
* Update the per-port timeout.
*/
- uart_update_timeout(port, termios->c_cflag,
quot
);
+ uart_update_timeout(port, termios->c_cflag,
baud
);
up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
if (termios->c_iflag & INPCK)