aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:02:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:02:24 -0700
commit24c83d45d76303db8325b8553a05c69c838ef370 (patch)
tree50c90d1c9b05aeec86e046f7d0f758b40c6d05ce /drivers/serial
parent1077682b2f97cee76a79cf38bab3fa022a97d9f8 (diff)
parent66172d259b816cbb65878a05d30771935a6928e8 (diff)
downloadlinux-24c83d45d76303db8325b8553a05c69c838ef370.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_lh7a40x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
index 32f808d157a15..8302376800c07 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
@@ -207,7 +207,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port)
return;
}
if (uart_circ_empty (xmit) || uart_tx_stopped (port)) {
- lh7a40xuart_stop_tx (port, 0);
+ lh7a40xuart_stop_tx (port);
return;
}
@@ -229,7 +229,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port)
uart_write_wakeup (port);
if (uart_circ_empty (xmit))
- lh7a40xuart_stop_tx (port, 0);
+ lh7a40xuart_stop_tx (port);
}
static void lh7a40xuart_modem_status (struct uart_port* port)