diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:23:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:23:44 -0400 |
| commit | dd4efa44ebf2a8a0e5edf60a53eadec981b4b10a (patch) | |
| tree | dd6e750c3e7228abb1f922de240b86d7d12d14bf /drivers/serial/sunsab.c | |
| parent | 1a04392bd6439876b1552793389cbb5be356ea54 (diff) | |
| parent | 046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/serial/sunsab.c')
| -rw-r--r-- | drivers/serial/sunsab.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index e971156daa60..ba9381fd3f2d 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
| @@ -274,7 +274,6 @@ static void transmit_chars(struct uart_sunsab_port *up, | |||
| 274 | if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { | 274 | if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { |
| 275 | up->interrupt_mask1 |= SAB82532_IMR1_XPR; | 275 | up->interrupt_mask1 |= SAB82532_IMR1_XPR; |
| 276 | writeb(up->interrupt_mask1, &up->regs->w.imr1); | 276 | writeb(up->interrupt_mask1, &up->regs->w.imr1); |
| 277 | uart_write_wakeup(&up->port); | ||
| 278 | return; | 277 | return; |
| 279 | } | 278 | } |
| 280 | 279 | ||