diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-03 13:09:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-03 13:09:43 -0700 |
| commit | 194d0710e1a7fe92dcf860ddd31fded8c3103b7a (patch) | |
| tree | da03b56fa4dee221c53af5770492d391f0d09459 /arch/arm/mach-ixp4xx/ixdp425-setup.c | |
| parent | a68d2ebc1581a3aec57bd032651e013fa609f530 (diff) | |
| parent | 9bbd03758945858c9303f3258b418b94c4ffd735 (diff) | |
| download | talos-op-linux-194d0710e1a7fe92dcf860ddd31fded8c3103b7a.tar.gz talos-op-linux-194d0710e1a7fe92dcf860ddd31fded8c3103b7a.zip | |
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 | 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[] = { .mapbase = IXP4XX_UART1_BASE_PHYS, .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, .irq = IRQ_IXP4XX_UART1, - .flags = UPF_BOOT_AUTOCONF, + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, .iotype = UPIO_MEM, .regshift = 2, .uartclk = IXP4XX_UART_XTAL, @@ -91,7 +91,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, - .flags = UPF_BOOT_AUTOCONF, + .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, .iotype = UPIO_MEM, .regshift = 2, .uartclk = IXP4XX_UART_XTAL, |
