Skip to content

L
linux
Commit 8370231b authored by Andy Grover's avatar Andy Grover Committed by Andy Grover
Browse files
Options

Make CONFIG_ACPI_BOOT work again (Pavel Machek)

parent aeac45ef
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
arch/i386/kernel/acpi.c
View file @ 8370231b
...@@ -52,11 +52,9 @@ ...@@ -52,11 +52,9 @@
Boot-time Configuration Boot-time Configuration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_BOOT
enum acpi_irq_model_id acpi_irq_model; enum acpi_irq_model_id acpi_irq_model;
#ifdef CONFIG_ACPI_BOOT
/* /*
* Use reserved fixmap pages for physical-to-virtual mappings of ACPI tables. * Use reserved fixmap pages for physical-to-virtual mappings of ACPI tables.
* Note that the same range is used for each table, so tables that need to * Note that the same range is used for each table, so tables that need to
......
include/linux/acpi.h
View file @ 8370231b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <asm/acpi.h> #include <asm/acpi.h>
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
enum acpi_irq_model_id { enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0, ACPI_IRQ_MODEL_PIC = 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7