Commit 74216699 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

ACPI / tables: Fix DSDT override mechanism

Commit 5ae74f2c (ACPI / tables: Move table override mechanisms to
tables.c) forgot to move the CONFIG_ACPI_CUSTOM_DSDT_FILE inclusion
directive from osl.c to tables.c.  Fix that.

Fixes: 5ae74f2c (ACPI / tables: Move table override mechanisms to tables.c)
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarLv Zheng <lv.zheng@intel.com>
parent 5d881327
...@@ -56,10 +56,6 @@ struct acpi_os_dpc { ...@@ -56,10 +56,6 @@ struct acpi_os_dpc {
struct work_struct work; struct work_struct work;
}; };
#ifdef CONFIG_ACPI_CUSTOM_DSDT
#include CONFIG_ACPI_CUSTOM_DSDT_FILE
#endif
#ifdef ENABLE_DEBUGGER #ifdef ENABLE_DEBUGGER
#include <linux/kdb.h> #include <linux/kdb.h>
......
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
#include <linux/memblock.h> #include <linux/memblock.h>
#include "internal.h" #include "internal.h"
#ifdef CONFIG_ACPI_CUSTOM_DSDT
#include CONFIG_ACPI_CUSTOM_DSDT_FILE
#endif
#define ACPI_MAX_TABLES 128 #define ACPI_MAX_TABLES 128
static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" }; static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };
......
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