diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:31:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:31:54 -0800 |
| commit | d195ea4b1456192abe780fd773778cbe9f6d77ea (patch) | |
| tree | 25ea330c4fced145290f6f5cfb1b06a1cf8402c0 /drivers/serial/imx.c | |
| parent | bb4bc81a234c66e8d8a4475110fa2d7988a34671 (diff) | |
| parent | df7559d3440ff759ff6e1371ff722bb3a73a3639 (diff) | |
| download | linux-3.10-d195ea4b1456192abe780fd773778cbe9f6d77ea.tar.gz linux-3.10-d195ea4b1456192abe780fd773778cbe9f6d77ea.tar.bz2 linux-3.10-d195ea4b1456192abe780fd773778cbe9f6d77ea.zip | |
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 fa3bbd6c751..858048efe1e 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -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, }, |