git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
drivers
/
serial
/
cpm_uart
/
cpm_uart_core.c
diff --git
a/drivers/serial/cpm_uart/cpm_uart_core.c
b/drivers/serial/cpm_uart/cpm_uart_core.c
index
8d349b2
..
300cea7
100644
(file)
--- a/
drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/
drivers/serial/cpm_uart/cpm_uart_core.c
@@
-649,7
+649,7
@@
static int cpm_uart_tx_pump(struct uart_port *port)
u8 *p;
int count;
struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
- struct circ_buf *xmit = &port->
info
->xmit;
+ struct circ_buf *xmit = &port->
state
->xmit;
/* Handle xon/xoff */
if (port->x_char) {