diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
| commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
| tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /drivers/serial/v850e_uart.c | |
| parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
| parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) | |
Merge branch 'viro'
Diffstat (limited to 'drivers/serial/v850e_uart.c')
| -rw-r--r-- | drivers/serial/v850e_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c index 9378895a8d56..df705fda4243 100644 --- a/drivers/serial/v850e_uart.c +++ b/drivers/serial/v850e_uart.c | |||
| @@ -496,7 +496,7 @@ static int __init v850e_uart_init (void) | |||
| 496 | 496 | ||
| 497 | port->ops = &v850e_uart_ops; | 497 | port->ops = &v850e_uart_ops; |
| 498 | port->line = chan; | 498 | port->line = chan; |
| 499 | port->iotype = SERIAL_IO_MEM; | 499 | port->iotype = UPIO_MEM; |
| 500 | port->flags = UPF_BOOT_AUTOCONF; | 500 | port->flags = UPF_BOOT_AUTOCONF; |
| 501 | 501 | ||
| 502 | /* We actually use multiple IRQs, but the serial | 502 | /* We actually use multiple IRQs, but the serial |