summaryrefslogtreecommitdiff
path: root/drivers/serial/imx.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 11:31:54 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 11:31:54 -0800
commitd195ea4b1456192abe780fd773778cbe9f6d77ea (patch)
tree25ea330c4fced145290f6f5cfb1b06a1cf8402c0 /drivers/serial/imx.c
parentbb4bc81a234c66e8d8a4475110fa2d7988a34671 (diff)
parentdf7559d3440ff759ff6e1371ff722bb3a73a3639 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/imx.c')
-rw-r--r--drivers/serial/imx.c4
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,
},