diff options
author | 2006-02-09 04:29:00 -0500 | |
---|---|---|
committer | 2006-02-09 04:29:00 -0500 | |
commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/serial/v850e_uart.c | |
parent | [libata sata_sil] implement 'slow_down' module parameter (diff) | |
parent | Merge branch 'master' (diff) | |
download | linux-dev-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.tar.xz linux-dev-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.zip |
Merge branch 'upstream-fixes'
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) port->ops = &v850e_uart_ops; port->line = chan; - port->iotype = SERIAL_IO_MEM; + port->iotype = UPIO_MEM; port->flags = UPF_BOOT_AUTOCONF; /* We actually use multiple IRQs, but the serial |