aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-31 13:49:26 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-31 13:49:26 -0800
commit35f349ee082de0be45eb23926d9fc7569f5011f0 (patch)
tree043db3b15bc9a76af3c519e7e715ef06e7f48c1b
parent82c9df820112c6286a8e8fbe482e94b65b49062c (diff)
parentf02aa3f9a3dea4375759ae1d87bebf2467719b72 (diff)
downloadlinux-stericsson-35f349ee082de0be45eb23926d9fc7569f5011f0.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-serial
-rw-r--r--drivers/serial/pxa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index ff5e6309d682..cc998b99a19f 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -361,7 +361,7 @@ static int serial_pxa_startup(struct uart_port *port)
if (port->line == 3) /* HWUART */
up->mcr |= UART_MCR_AFE;
else
- up->mcr = 0;
+ up->mcr = 0;
/*
* Allocate the IRQ
@@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
int i;
/*
- * First save the UER then disable the interrupts
+ * First save the IER then disable the interrupts
*/
ier = serial_in(up, UART_IER);
serial_out(up, UART_IER, UART_IER_UUE);