summaryrefslogtreecommitdiffstats
path: root/drivers/serial/21285.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-02-03 23:49:49 +0100
committerAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>2006-02-03 23:49:49 +0100
commit01d206a7c1167639f6ca6dac22140fbdca017558 (patch)
treebc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /drivers/serial/21285.c
parent9c4b562abc9005e4b413de02c85d3d29da707cba (diff)
parentd6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff)
downloadtalos-op-linux-01d206a7c1167639f6ca6dac22140fbdca017558.tar.gz
talos-op-linux-01d206a7c1167639f6ca6dac22140fbdca017558.zip
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/serial/21285.c')
-rw-r--r--drivers/serial/21285.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 221999bcf8fe..7aef7518b0d1 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -366,7 +366,7 @@ static struct uart_port serial21285_port = {
.irq = NO_IRQ,
.fifosize = 16,
.ops = &serial21285_ops,
- .flags = ASYNC_BOOT_AUTOCONF,
+ .flags = UPF_BOOT_AUTOCONF,
};
static void serial21285_setup_ports(void)
OpenPOWER on IntegriCloud