diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:53:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:53:33 -0800 |
| commit | ca98f825ea05edb41346f12408caa30be8a287c6 (patch) | |
| tree | 98826d67758b0bd028a04e16446441adb66f4d66 /arch/arm/mach-ixp4xx/ixdp425-setup.c | |
| parent | b67c26e4fcfdade157d5bd54085720e71518cccd (diff) | |
| parent | 11849fe67430ba48547e17b25a7831da29863efa (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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[] = { { .mapbase = IXP4XX_UART2_BASE_PHYS, .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, - .irq = IRQ_IXP4XX_UART1, + .irq = IRQ_IXP4XX_UART2, .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, .iotype = UPIO_MEM, .regshift = 2, |