diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
| commit | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (patch) | |
| tree | b5493c816a1f76a01319a84955c5ba07d47517c3 /drivers/serial/pxa.c | |
| parent | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/serial/pxa.c')
| -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); |