diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/serial/sunsab.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/serial/sunsab.c')
| -rw-r--r-- | drivers/serial/sunsab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index d514e28d0755..d2e0321049e2 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
| @@ -474,7 +474,7 @@ static void sunsab_stop_rx(struct uart_port *port) | |||
| 474 | { | 474 | { |
| 475 | struct uart_sunsab_port *up = (struct uart_sunsab_port *) port; | 475 | struct uart_sunsab_port *up = (struct uart_sunsab_port *) port; |
| 476 | 476 | ||
| 477 | up->interrupt_mask0 |= SAB82532_ISR0_TCD; | 477 | up->interrupt_mask0 |= SAB82532_IMR0_TCD; |
| 478 | writeb(up->interrupt_mask1, &up->regs->w.imr0); | 478 | writeb(up->interrupt_mask1, &up->regs->w.imr0); |
| 479 | } | 479 | } |
| 480 | 480 | ||