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/amba-pl010.c | |
| parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
| parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) | |
Merge branch 'viro'
Diffstat (limited to 'drivers/serial/amba-pl010.c')
| -rw-r--r-- | drivers/serial/amba-pl010.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 429de2723a1c..321a3b3a5728 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -561,7 +561,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { | |||
| 561 | .port = { | 561 | .port = { |
| 562 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE), | 562 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE), |
| 563 | .mapbase = INTEGRATOR_UART0_BASE, | 563 | .mapbase = INTEGRATOR_UART0_BASE, |
| 564 | .iotype = SERIAL_IO_MEM, | 564 | .iotype = UPIO_MEM, |
| 565 | .irq = IRQ_UARTINT0, | 565 | .irq = IRQ_UARTINT0, |
| 566 | .uartclk = 14745600, | 566 | .uartclk = 14745600, |
| 567 | .fifosize = 16, | 567 | .fifosize = 16, |
| @@ -576,7 +576,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { | |||
| 576 | .port = { | 576 | .port = { |
| 577 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE), | 577 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE), |
| 578 | .mapbase = INTEGRATOR_UART1_BASE, | 578 | .mapbase = INTEGRATOR_UART1_BASE, |
| 579 | .iotype = SERIAL_IO_MEM, | 579 | .iotype = UPIO_MEM, |
| 580 | .irq = IRQ_UARTINT1, | 580 | .irq = IRQ_UARTINT1, |
| 581 | .uartclk = 14745600, | 581 | .uartclk = 14745600, |
| 582 | .fifosize = 16, | 582 | .fifosize = 16, |