From: Yinghai Lu <Yinghai.Lu@Sun.COM>

please use this one instead. it fixs ia64 compilation.

Signed-off-by: <yinghai.lu@sun.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Gerd Hoffmann <kraxel@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/firmware/pcdp.c     |    5 +++--
 drivers/serial/8250_early.c |    2 +-
 include/linux/serial_8250.h |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff -puN drivers/firmware/pcdp.c~serial-convert-early_uart-to-earlycon-for-8250-fix drivers/firmware/pcdp.c
--- a/drivers/firmware/pcdp.c~serial-convert-early_uart-to-earlycon-for-8250-fix
+++ a/drivers/firmware/pcdp.c
@@ -15,6 +15,7 @@
 #include <linux/console.h>
 #include <linux/efi.h>
 #include <linux/serial.h>
+#include <linux/serial_8250.h>
 #include <asm/vga.h>
 #include "pcdp.h"
 
@@ -27,7 +28,7 @@ setup_serial_console(struct pcdp_uart *u
 	char parity;
 
 	mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY);
-	p += sprintf(p, "console=uart,%s,0x%lx",
+	p += sprintf(p, "uart8250,%s,0x%lx",
 		mmio ? "mmio" : "io", uart->addr.address);
 	if (uart->baud) {
 		p += sprintf(p, ",%lu", uart->baud);
@@ -41,7 +42,7 @@ setup_serial_console(struct pcdp_uart *u
 		}
 	}
 
-	return early_serial_console_init(options);
+	return setup_early_serial8250_console(options);
 #else
 	return -ENODEV;
 #endif
diff -puN drivers/serial/8250_early.c~serial-convert-early_uart-to-earlycon-for-8250-fix drivers/serial/8250_early.c
--- a/drivers/serial/8250_early.c~serial-convert-early_uart-to-earlycon-for-8250-fix
+++ a/drivers/serial/8250_early.c
@@ -204,7 +204,7 @@ static int __init early_serial8250_setup
 	return 0;
 }
 
-static int __init setup_early_serial8250_console(char *cmdline)
+int __init setup_early_serial8250_console(char *cmdline)
 {
 	char *options;
 	int err;
diff -puN include/linux/serial_8250.h~serial-convert-early_uart-to-earlycon-for-8250-fix include/linux/serial_8250.h
--- a/include/linux/serial_8250.h~serial-convert-early_uart-to-earlycon-for-8250-fix
+++ a/include/linux/serial_8250.h
@@ -62,5 +62,6 @@ void serial8250_resume_port(int line);
 
 extern int serial8250_find_port(struct uart_port *p);
 extern int serial8250_find_port_for_earlycon(void);
+extern int setup_early_serial8250_console(char *cmdline);
 
 #endif
_