aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/4xx/xilinx_ml300.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 14:17:05 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 14:17:05 -0500
commit70c07e02625ec46d0ffbfce1acef42d660803528 (patch)
treef500f1a4f93e72747fb08b0eefabb167dcdc5db9 /arch/ppc/platforms/4xx/xilinx_ml300.c
parent5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff)
parent2746b8623abce815aaae7afc946b1b39f8436f5a (diff)
downloadkernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.zip
kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.tar.gz
kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.tar.bz2
Merge branch 'viro'
Diffstat (limited to 'arch/ppc/platforms/4xx/xilinx_ml300.c')
-rw-r--r--arch/ppc/platforms/4xx/xilinx_ml300.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c
index 0b1b77d..e90d97f 100644
--- a/arch/ppc/platforms/4xx/xilinx_ml300.c
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.c
@@ -95,8 +95,8 @@ ml300_early_serial_map(void)
port.irq = old_ports[i].irq;
port.uartclk = old_ports[i].baud_base * 16;
port.regshift = old_ports[i].iomem_reg_shift;
- port.iotype = SERIAL_IO_MEM;
- port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+ port.iotype = UPIO_MEM;
+ port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = i;
if (early_serial_setup(&port) != 0) {