diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-31 22:49:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-31 22:49:26 +0100 |
| commit | 35f349ee082de0be45eb23926d9fc7569f5011f0 (patch) | |
| tree | 043db3b15bc9a76af3c519e7e715ef06e7f48c1b | |
| parent | [PATCH] Fix false old value return of sysctl (diff) | |
| parent | [ARM] 3216/1: indent and typo in drivers/serial/pxa.c (diff) | |
| download | linux-35f349ee082de0be45eb23926d9fc7569f5011f0.tar.xz linux-35f349ee082de0be45eb23926d9fc7569f5011f0.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/pxa.c | 4 |
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); |