diff options
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index ec3a286163c3..2aa92094b59d 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/ioport.h> | 36 | #include <linux/ioport.h> |
37 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
38 | #include <linux/efi-bgrt.h> | 38 | #include <linux/efi-bgrt.h> |
39 | #include <linux/serial_core.h> | ||
39 | 40 | ||
40 | #include <asm/e820/api.h> | 41 | #include <asm/e820/api.h> |
41 | #include <asm/irqdomain.h> | 42 | #include <asm/irqdomain.h> |
@@ -1625,6 +1626,8 @@ int __init acpi_boot_init(void) | |||
1625 | if (!acpi_noirq) | 1626 | if (!acpi_noirq) |
1626 | x86_init.pci.init = pci_acpi_init; | 1627 | x86_init.pci.init = pci_acpi_init; |
1627 | 1628 | ||
1629 | /* Do not enable ACPI SPCR console by default */ | ||
1630 | acpi_parse_spcr(earlycon_acpi_spcr_enable, false); | ||
1628 | return 0; | 1631 | return 0; |
1629 | } | 1632 | } |
1630 | 1633 | ||