diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:03:28 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:03:28 -0500 |
| commit | 2fde9901f6702ab82b5b2740fec9a7f9a80ddde4 (patch) | |
| tree | 0ca92fabd4169095a50b43b8981d2a6c54f98531 /arch/arm/mach-ixp4xx/ixdp425-setup.c | |
| parent | f89c2b464558a21fd3be8d578b7d13e810fb6b8a (diff) | |
| parent | 3b6efee9231e12fce09c94930bfc59f66f18d662 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 0a41080d2266..3a22d84e1047 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
| @@ -85,7 +85,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { | |||
| 85 | { | 85 | { |
| 86 | .mapbase = IXP4XX_UART2_BASE_PHYS, | 86 | .mapbase = IXP4XX_UART2_BASE_PHYS, |
| 87 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | 87 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, |
| 88 | .irq = IRQ_IXP4XX_UART1, | 88 | .irq = IRQ_IXP4XX_UART2, |
| 89 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, | 89 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 90 | .iotype = UPIO_MEM, | 90 | .iotype = UPIO_MEM, |
| 91 | .regshift = 2, | 91 | .regshift = 2, |