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/coyote-setup.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'arch/arm/mach-ixp4xx/coyote-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/coyote-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 4ff4393ef0ea..7f58afb27e71 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c | |||
| @@ -61,7 +61,7 @@ static struct plat_serial8250_port coyote_uart_data[] = { | |||
| 61 | .mapbase = IXP4XX_UART2_BASE_PHYS, | 61 | .mapbase = IXP4XX_UART2_BASE_PHYS, |
| 62 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | 62 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, |
| 63 | .irq = IRQ_IXP4XX_UART2, | 63 | .irq = IRQ_IXP4XX_UART2, |
| 64 | .flags = UPF_BOOT_AUTOCONF, | 64 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 65 | .iotype = UPIO_MEM, | 65 | .iotype = UPIO_MEM, |
| 66 | .regshift = 2, | 66 | .regshift = 2, |
| 67 | .uartclk = IXP4XX_UART_XTAL, | 67 | .uartclk = IXP4XX_UART_XTAL, |