diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:21:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:21:22 -0800 |
commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/ppc/platforms/4xx/xilinx_ml300.c | |
parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/ppc/platforms/4xx/xilinx_ml300.c')
-rw-r--r-- | arch/ppc/platforms/4xx/xilinx_ml300.c | 4 |
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 0b1b77d986b..e90d97f64f7 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) { |