diff options
Diffstat (limited to 'drivers/firmware/pcdp.c')
-rw-r--r-- | drivers/firmware/pcdp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c index 2b4b76e8bd72..58e9f8e457f8 100644 --- a/drivers/firmware/pcdp.c +++ b/drivers/firmware/pcdp.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/console.h> | 15 | #include <linux/console.h> |
16 | #include <linux/efi.h> | 16 | #include <linux/efi.h> |
17 | #include <linux/serial.h> | 17 | #include <linux/serial.h> |
18 | #include <linux/serial_8250.h> | ||
18 | #include <asm/vga.h> | 19 | #include <asm/vga.h> |
19 | #include "pcdp.h" | 20 | #include "pcdp.h" |
20 | 21 | ||
@@ -27,7 +28,7 @@ setup_serial_console(struct pcdp_uart *uart) | |||
27 | char parity; | 28 | char parity; |
28 | 29 | ||
29 | mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY); | 30 | mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY); |
30 | p += sprintf(p, "console=uart,%s,0x%lx", | 31 | p += sprintf(p, "uart8250,%s,0x%lx", |
31 | mmio ? "mmio" : "io", uart->addr.address); | 32 | mmio ? "mmio" : "io", uart->addr.address); |
32 | if (uart->baud) { | 33 | if (uart->baud) { |
33 | p += sprintf(p, ",%lu", uart->baud); | 34 | p += sprintf(p, ",%lu", uart->baud); |
@@ -41,7 +42,8 @@ setup_serial_console(struct pcdp_uart *uart) | |||
41 | } | 42 | } |
42 | } | 43 | } |
43 | 44 | ||
44 | return early_serial_console_init(options); | 45 | add_preferred_console("uart", 8250, &options[9]); |
46 | return setup_early_serial8250_console(options); | ||
45 | #else | 47 | #else |
46 | return -ENODEV; | 48 | return -ENODEV; |
47 | #endif | 49 | #endif |