diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /arch/arm/mach-ixp4xx/ixdp425-setup.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index c2ba759e9946..4633470a6a37 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
| @@ -82,7 +82,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { | |||
| 82 | .mapbase = IXP4XX_UART1_BASE_PHYS, | 82 | .mapbase = IXP4XX_UART1_BASE_PHYS, |
| 83 | .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, | 83 | .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, |
| 84 | .irq = IRQ_IXP4XX_UART1, | 84 | .irq = IRQ_IXP4XX_UART1, |
| 85 | .flags = UPF_BOOT_AUTOCONF, | 85 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 86 | .iotype = UPIO_MEM, | 86 | .iotype = UPIO_MEM, |
| 87 | .regshift = 2, | 87 | .regshift = 2, |
| 88 | .uartclk = IXP4XX_UART_XTAL, | 88 | .uartclk = IXP4XX_UART_XTAL, |
| @@ -91,7 +91,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { | |||
| 91 | .mapbase = IXP4XX_UART2_BASE_PHYS, | 91 | .mapbase = IXP4XX_UART2_BASE_PHYS, |
| 92 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | 92 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, |
| 93 | .irq = IRQ_IXP4XX_UART1, | 93 | .irq = IRQ_IXP4XX_UART1, |
| 94 | .flags = UPF_BOOT_AUTOCONF, | 94 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 95 | .iotype = UPIO_MEM, | 95 | .iotype = UPIO_MEM, |
| 96 | .regshift = 2, | 96 | .regshift = 2, |
| 97 | .uartclk = IXP4XX_UART_XTAL, | 97 | .uartclk = IXP4XX_UART_XTAL, |