summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:44:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:44:47 -0700
commit7de4a9a73563e5f6f3c153015fadee433a443241 (patch)
treed70e27c20bc612c58ec123e581f2ce7c02553888 /drivers/serial
parent1097d7cef683c30f9768007daae2e961a0686a10 (diff)
parentf04e879bf296d136bcafd8c5a26e95599b141671 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sunxvr1000: Add missing FB=y depenency. MAINTAINERS: Add entry for sparc serial drivers. drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/sunsab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index d514e28d075..d2e0321049e 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -474,7 +474,7 @@ static void sunsab_stop_rx(struct uart_port *port)
{
struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
- up->interrupt_mask0 |= SAB82532_ISR0_TCD;
+ up->interrupt_mask0 |= SAB82532_IMR0_TCD;
writeb(up->interrupt_mask1, &up->regs->w.imr0);
}