diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 15:49:28 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 15:49:28 -0500 |
| commit | 638e174688f58200d0deb7435093435e7d737b09 (patch) | |
| tree | a2cd32dbb41daf0a5d4e69eff1805fd5574c292a /drivers/serial/21285.c | |
| parent | 8d58d773b745950ac912e028b3c81f4902fbf91d (diff) | |
| parent | d195ea4b1456192abe780fd773778cbe9f6d77ea (diff) | |
Merge branch 'origin'
Diffstat (limited to 'drivers/serial/21285.c')
| -rw-r--r-- | drivers/serial/21285.c | 2 |
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 = { | |||
| 366 | .irq = NO_IRQ, | 366 | .irq = NO_IRQ, |
| 367 | .fifosize = 16, | 367 | .fifosize = 16, |
| 368 | .ops = &serial21285_ops, | 368 | .ops = &serial21285_ops, |
| 369 | .flags = ASYNC_BOOT_AUTOCONF, | 369 | .flags = UPF_BOOT_AUTOCONF, |
| 370 | }; | 370 | }; |
| 371 | 371 | ||
| 372 | static void serial21285_setup_ports(void) | 372 | static void serial21285_setup_ports(void) |