diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-11 16:39:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-11 16:39:24 -0700 |
commit | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (patch) | |
tree | c6f31816e5a5afc84e920c6c3f5702327dd990de /drivers/serial/sunsab.c | |
parent | f5154a98a1931641f0448f6512294a15279110d7 (diff) | |
parent | b1b510aa284af1908d5d369d52f7dae16aaabd71 (diff) | |
download | blackbird-op-linux-da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89.tar.gz blackbird-op-linux-da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
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, if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { up->interrupt_mask1 |= SAB82532_IMR1_XPR; writeb(up->interrupt_mask1, &up->regs->w.imr1); - uart_write_wakeup(&up->port); return; } |