Auto-update from upstream

[linux-2.6] / arch / ppc / platforms / 4xx / ebony.c

diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index 352b76c08987dc72ecbd6662f844644944e03390..b4ecb9c798541e4cea57accaff4a3c1736f1c035 100644 (file)
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ebony.c
- *
  * Ebony board specific routines
  *
  * Matt Porter <mporter@kernel.crashing.org>
@@ -226,7 +224,7 @@ ebony_early_serial_map(void)
        port.uartclk = clocks.uart0;
        port.regshift = 0;
        port.iotype = UPIO_MEM;
-       port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+       port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
        port.line = 0;
 
        if (early_serial_setup(&port) != 0) {