Merge master.kernel.org:/home/rmk/linux-2.6-serial

git-mirror · Dec 31, 2005 · 35f349e · 35f349e
2 parents 82c9df8 + f02aa3f
commit 35f349e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);