diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/serial/serial_lh7a40x.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/serial/serial_lh7a40x.c')
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index d4a1f0e798c1..04186eaae227 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
| @@ -501,12 +501,12 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { | |||
| 501 | .port = { | 501 | .port = { |
| 502 | .membase = (void*) io_p2v (UART1_PHYS), | 502 | .membase = (void*) io_p2v (UART1_PHYS), |
| 503 | .mapbase = UART1_PHYS, | 503 | .mapbase = UART1_PHYS, |
| 504 | .iotype = SERIAL_IO_MEM, | 504 | .iotype = UPIO_MEM, |
| 505 | .irq = IRQ_UART1INTR, | 505 | .irq = IRQ_UART1INTR, |
| 506 | .uartclk = 14745600/2, | 506 | .uartclk = 14745600/2, |
| 507 | .fifosize = 16, | 507 | .fifosize = 16, |
| 508 | .ops = &lh7a40x_uart_ops, | 508 | .ops = &lh7a40x_uart_ops, |
| 509 | .flags = ASYNC_BOOT_AUTOCONF, | 509 | .flags = UPF_BOOT_AUTOCONF, |
| 510 | .line = 0, | 510 | .line = 0, |
| 511 | }, | 511 | }, |
| 512 | }, | 512 | }, |
| @@ -514,12 +514,12 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { | |||
| 514 | .port = { | 514 | .port = { |
| 515 | .membase = (void*) io_p2v (UART2_PHYS), | 515 | .membase = (void*) io_p2v (UART2_PHYS), |
| 516 | .mapbase = UART2_PHYS, | 516 | .mapbase = UART2_PHYS, |
| 517 | .iotype = SERIAL_IO_MEM, | 517 | .iotype = UPIO_MEM, |
| 518 | .irq = IRQ_UART2INTR, | 518 | .irq = IRQ_UART2INTR, |
| 519 | .uartclk = 14745600/2, | 519 | .uartclk = 14745600/2, |
| 520 | .fifosize = 16, | 520 | .fifosize = 16, |
| 521 | .ops = &lh7a40x_uart_ops, | 521 | .ops = &lh7a40x_uart_ops, |
| 522 | .flags = ASYNC_BOOT_AUTOCONF, | 522 | .flags = UPF_BOOT_AUTOCONF, |
| 523 | .line = 1, | 523 | .line = 1, |
| 524 | }, | 524 | }, |
| 525 | }, | 525 | }, |
| @@ -527,12 +527,12 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { | |||
| 527 | .port = { | 527 | .port = { |
| 528 | .membase = (void*) io_p2v (UART3_PHYS), | 528 | .membase = (void*) io_p2v (UART3_PHYS), |
| 529 | .mapbase = UART3_PHYS, | 529 | .mapbase = UART3_PHYS, |
| 530 | .iotype = SERIAL_IO_MEM, | 530 | .iotype = UPIO_MEM, |
| 531 | .irq = IRQ_UART3INTR, | 531 | .irq = IRQ_UART3INTR, |
| 532 | .uartclk = 14745600/2, | 532 | .uartclk = 14745600/2, |
| 533 | .fifosize = 16, | 533 | .fifosize = 16, |
| 534 | .ops = &lh7a40x_uart_ops, | 534 | .ops = &lh7a40x_uart_ops, |
| 535 | .flags = ASYNC_BOOT_AUTOCONF, | 535 | .flags = UPF_BOOT_AUTOCONF, |
| 536 | .line = 2, | 536 | .line = 2, |
| 537 | }, | 537 | }, |
| 538 | }, | 538 | }, |