Merge branch 'stable/for-jens-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / firmware / pcdp.c

diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index 2b4b76e8bd723ac25b6aa57b55cf57e23736297a..51e0e2d8fac6345859e1c7083c7a3c86a9b5add3 100644 (file)
--- a/drivers/firmware/pcdp.c
+++ b/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,10 +28,10 @@ setup_serial_console(struct pcdp_uart *uart)
        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%llx",
                mmio ? "mmio" : "io", uart->addr.address);
        if (uart->baud) {
-               p += sprintf(p, ",%lu", uart->baud);
+               p += sprintf(p, ",%llu", uart->baud);
                if (uart->bits) {
                        switch (uart->parity) {
                            case 0x2: parity = 'e'; break;
@@ -41,7 +42,8 @@ setup_serial_console(struct pcdp_uart *uart)
                }
        }
 
-       return early_serial_console_init(options);
+       add_preferred_console("uart", 8250, &options[9]);
+       return setup_early_serial8250_console(options);
 #else
        return -ENODEV;
 #endif