diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
| commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
| tree | 6a52864aff79691689aea21cb0cb928327d5de5b /drivers/serial/v850e_uart.c | |
| parent | 69eb66d7da7dba2696281981347698e1693c2340 (diff) | |
| parent | a488edc914aa1d766a4e2c982b5ae03d5657ec1b (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 |