diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 00:53:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 00:53:36 -0700 |
| commit | 138307b475286a5bcc985b06b3e71fcd33dd5e2c (patch) | |
| tree | e025c7cb26396b07f157eea20a1cfb037b66758f /drivers/serial/pxa.c | |
| parent | 66f3767376e2bbffb4c2c78ea171e1fdcb62201b (diff) | |
| parent | bc49a661e6e82bfa8219c3d0a2e4dea51c847d23 (diff) | |
| download | kernel-crypto-138307b475286a5bcc985b06b3e71fcd33dd5e2c.tar.gz kernel-crypto-138307b475286a5bcc985b06b3e71fcd33dd5e2c.tar.xz kernel-crypto-138307b475286a5bcc985b06b3e71fcd33dd5e2c.zip | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/pxa.c')
| -rw-r--r-- | drivers/serial/pxa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 461c81c9320..eaa0af83529 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c @@ -80,7 +80,7 @@ static void serial_pxa_enable_ms(struct uart_port *port) serial_out(up, UART_IER, up->ier); } -static void serial_pxa_stop_tx(struct uart_port *port, unsigned int tty_stop) +static void serial_pxa_stop_tx(struct uart_port *port) { struct uart_pxa_port *up = (struct uart_pxa_port *)port; @@ -185,7 +185,7 @@ static void transmit_chars(struct uart_pxa_port *up) return; } if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { - serial_pxa_stop_tx(&up->port, 0); + serial_pxa_stop_tx(&up->port); return; } @@ -203,10 +203,10 @@ static void transmit_chars(struct uart_pxa_port *up) if (uart_circ_empty(xmit)) - serial_pxa_stop_tx(&up->port, 0); + serial_pxa_stop_tx(&up->port); } -static void serial_pxa_start_tx(struct uart_port *port, unsigned int tty_start) +static void serial_pxa_start_tx(struct uart_port *port) { struct uart_pxa_port *up = (struct uart_pxa_port *)port; |