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

35f349ee · Linus Torvalds · 82c9df82 · f02aa3f9 · 35f349ee
Commit 35f349ee authored Dec 31, 2005 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/serial/pxa.c drivers/serial/pxa.c +2 -2

No files found.
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -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);