lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2006-01-31 11:31:54 -08:00
parent bb4bc81a23 df7559d344
commit d195ea4b14
14 changed files with 121 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/serial/imx.c
View File

@ -674,7 +674,7 @@ static struct imx_port imx_ports[] = {
.irq = UART1_MINT_RX,
.uartclk = 16000000,
.fifosize = 8,
.flags = ASYNC_BOOT_AUTOCONF,
.flags = UPF_BOOT_AUTOCONF,
.ops = &imx_pops,
.line = 0,
},
@ -690,7 +690,7 @@ static struct imx_port imx_ports[] = {
.irq = UART2_MINT_RX,
.uartclk = 16000000,
.fifosize = 8,
.flags = ASYNC_BOOT_AUTOCONF,
.flags = UPF_BOOT_AUTOCONF,
.ops = &imx_pops,
.line = 1,
},