tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 35f349ee 82c9df82

+2 -2
+2 -2
drivers/serial/pxa.c
··· 361 361 if (port->line == 3) /* HWUART */ 362 362 up->mcr |= UART_MCR_AFE; 363 363 else 364 - up->mcr = 0; 364 + up->mcr = 0; 365 365 366 366 /* 367 367 * Allocate the IRQ ··· 641 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 646 ier = serial_in(up, UART_IER); 647 647 serial_out(up, UART_IER, UART_IER_UUE);