diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:31:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:31:54 -0500 |
| commit | d195ea4b1456192abe780fd773778cbe9f6d77ea (patch) | |
| tree | 25ea330c4fced145290f6f5cfb1b06a1cf8402c0 /drivers/serial/imx.c | |
| parent | bb4bc81a234c66e8d8a4475110fa2d7988a34671 (diff) | |
| parent | df7559d3440ff759ff6e1371ff722bb3a73a3639 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/imx.c')
| -rw-r--r-- | drivers/serial/imx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index fa3bbd6c751f..858048efe1ed 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -674,7 +674,7 @@ static struct imx_port imx_ports[] = { | |||
| 674 | .irq = UART1_MINT_RX, | 674 | .irq = UART1_MINT_RX, |
| 675 | .uartclk = 16000000, | 675 | .uartclk = 16000000, |
| 676 | .fifosize = 8, | 676 | .fifosize = 8, |
| 677 | .flags = ASYNC_BOOT_AUTOCONF, | 677 | .flags = UPF_BOOT_AUTOCONF, |
| 678 | .ops = &imx_pops, | 678 | .ops = &imx_pops, |
| 679 | .line = 0, | 679 | .line = 0, |
| 680 | }, | 680 | }, |
| @@ -690,7 +690,7 @@ static struct imx_port imx_ports[] = { | |||
| 690 | .irq = UART2_MINT_RX, | 690 | .irq = UART2_MINT_RX, |
| 691 | .uartclk = 16000000, | 691 | .uartclk = 16000000, |
| 692 | .fifosize = 8, | 692 | .fifosize = 8, |
| 693 | .flags = ASYNC_BOOT_AUTOCONF, | 693 | .flags = UPF_BOOT_AUTOCONF, |
| 694 | .ops = &imx_pops, | 694 | .ops = &imx_pops, |
| 695 | .line = 1, | 695 | .line = 1, |
| 696 | }, | 696 | }, |