diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /drivers/serial/sunsab.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 | ||