diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /arch/ppc/platforms/4xx/yucca.c | |
| parent | [libata sata_sil] implement 'slow_down' module parameter (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-dev-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.tar.xz linux-dev-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/ppc/platforms/4xx/yucca.c')
| -rw-r--r-- | arch/ppc/platforms/4xx/yucca.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c index e60f4bd437ec..b065b8babcd3 100644 --- a/arch/ppc/platforms/4xx/yucca.c +++ b/arch/ppc/platforms/4xx/yucca.c @@ -305,8 +305,8 @@ yucca_early_serial_map(void) port.irq = UART0_INT; port.uartclk = clocks.uart0; port.regshift = 0; - 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 = 0; if (early_serial_setup(&port) != 0) { |