hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI / tables: Fix DSDT override mechanism 

Commit 5ae74f2cc2 (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: 5ae74f2cc2 (ACPI / tables: Move table override mechanisms to tables.c)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Lv Zheng <lv.zheng@intel.com>
This commit is contained in:
Rafael J. Wysocki 2016-05-06 01:27:09 +02:00
parent 5d8813271f
commit 74216699dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/osl.c
View File

@ -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>

4
drivers/acpi/tables.c
View File

@ -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" };