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/mpc52xx_uart.c | |
| parent | 66f3767376e2bbffb4c2c78ea171e1fdcb62201b (diff) | |
| parent | bc49a661e6e82bfa8219c3d0a2e4dea51c847d23 (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 2a5cf174ca3..a3cd0ee8486 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -119,7 +119,7 @@ mpc52xx_uart_get_mctrl(struct uart_port *port) } static void -mpc52xx_uart_stop_tx(struct uart_port *port, unsigned int tty_stop) +mpc52xx_uart_stop_tx(struct uart_port *port) { /* port->lock taken by caller */ port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY; @@ -127,7 +127,7 @@ mpc52xx_uart_stop_tx(struct uart_port *port, unsigned int tty_stop) } static void -mpc52xx_uart_start_tx(struct uart_port *port, unsigned int tty_start) +mpc52xx_uart_start_tx(struct uart_port *port) { /* port->lock taken by caller */ port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY; @@ -485,7 +485,7 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port) /* Nothing to do ? */ if (uart_circ_empty(xmit) || uart_tx_stopped(port)) { - mpc52xx_uart_stop_tx(port,0); + mpc52xx_uart_stop_tx(port); return 0; } @@ -504,7 +504,7 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port) /* Maybe we're done after all */ if (uart_circ_empty(xmit)) { - mpc52xx_uart_stop_tx(port,0); + mpc52xx_uart_stop_tx(port); return 0; } |