diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
| commit | 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed (patch) | |
| tree | 6f977546112ccbd617ef40ae38a1ca558d71bce9 /drivers/serial/clps711x.c | |
| parent | 332b5a52f2f96bc2d13bbe594a430318c0ee4425 (diff) | |
| parent | 8a19ac89edbe9b702c10fd2039b8cb2db4644a5f (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/serial/clps711x.c')
| -rw-r--r-- | drivers/serial/clps711x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 8ef999481f93..ce7b2e4ecd17 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c @@ -410,7 +410,7 @@ static struct uart_port clps711x_ports[UART_NR] = { .fifosize = 16, .ops = &clps711x_pops, .line = 0, - .flags = ASYNC_BOOT_AUTOCONF, + .flags = UPF_BOOT_AUTOCONF, }, { .iobase = SYSCON2, @@ -419,7 +419,7 @@ static struct uart_port clps711x_ports[UART_NR] = { .fifosize = 16, .ops = &clps711x_pops, .line = 1, - .flags = ASYNC_BOOT_AUTOCONF, + .flags = UPF_BOOT_AUTOCONF, } }; |