Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Linus Torvalds 2005-12-31 13:49:26 -08:00
commit 35f349ee08
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/serial/pxa.c
View file

@ -361,7 +361,7 @@ static int serial_pxa_startup(struct uart_port *port)
if (port->line == 3) /* HWUART */ if (port->line == 3) /* HWUART */
up->mcr |= UART_MCR_AFE; up->mcr |= UART_MCR_AFE;
else else
up->mcr = 0; up->mcr = 0;
/* /*
* Allocate the IRQ * Allocate the IRQ
@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
int i; int i;
/* /*
* First save the UER then disable the interrupts * First save the IER then disable the interrupts
*/ */
ier = serial_in(up, UART_IER); ier = serial_in(up, UART_IER);
serial_out(up, UART_IER, UART_IER_UUE); serial_out(up, UART_IER, UART_IER_UUE);