diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/serial/serial_lh7a40x.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/serial/serial_lh7a40x.c')
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 32f808d157a1..8302376800c0 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) | |||
| 207 | return; | 207 | return; |
| 208 | } | 208 | } |
| 209 | if (uart_circ_empty (xmit) || uart_tx_stopped (port)) { | 209 | if (uart_circ_empty (xmit) || uart_tx_stopped (port)) { |
| 210 | lh7a40xuart_stop_tx (port, 0); | 210 | lh7a40xuart_stop_tx (port); |
| 211 | return; | 211 | return; |
| 212 | } | 212 | } |
| 213 | 213 | ||
| @@ -229,7 +229,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port) | |||
| 229 | uart_write_wakeup (port); | 229 | uart_write_wakeup (port); |
| 230 | 230 | ||
| 231 | if (uart_circ_empty (xmit)) | 231 | if (uart_circ_empty (xmit)) |
| 232 | lh7a40xuart_stop_tx (port, 0); | 232 | lh7a40xuart_stop_tx (port); |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | static void lh7a40xuart_modem_status (struct uart_port* port) | 235 | static void lh7a40xuart_modem_status (struct uart_port* port) |