diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-31 16:49:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-31 16:49:26 -0500 |
| commit | 35f349ee082de0be45eb23926d9fc7569f5011f0 (patch) | |
| tree | 043db3b15bc9a76af3c519e7e715ef06e7f48c1b | |
| parent | 82c9df820112c6286a8e8fbe482e94b65b49062c (diff) | |
| parent | f02aa3f9a3dea4375759ae1d87bebf2467719b72 (diff) | |
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) | |||
| 361 | if (port->line == 3) /* HWUART */ | 361 | if (port->line == 3) /* HWUART */ |
| 362 | up->mcr |= UART_MCR_AFE; | 362 | up->mcr |= UART_MCR_AFE; |
| 363 | else | 363 | else |
| 364 | up->mcr = 0; | 364 | up->mcr = 0; |
| 365 | 365 | ||
| 366 | /* | 366 | /* |
| 367 | * Allocate the IRQ | 367 | * Allocate the IRQ |
| @@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) | |||
| 641 | int i; | 641 | int i; |
| 642 | 642 | ||
| 643 | /* | 643 | /* |
| 644 | * First save the UER then disable the interrupts | 644 | * First save the IER then disable the interrupts |
| 645 | */ | 645 | */ |
| 646 | ier = serial_in(up, UART_IER); | 646 | ier = serial_in(up, UART_IER); |
| 647 | serial_out(up, UART_IER, UART_IER_UUE); | 647 | serial_out(up, UART_IER, UART_IER_UUE); |