diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-05 19:27:09 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-06 07:20:11 -0400 |
commit | 74216699ddcca13541e8494cb2b995e6a44a04d9 (patch) | |
tree | 1df8315f3956f3c51d3417c144907949115f50ff | |
parent | 5d8813271f8a7c86027afb2ef554f2a5a9ba7c15 (diff) |
ACPI / tables: Fix DSDT override mechanism
Commit 5ae74f2cc2f1 (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: 5ae74f2cc2f1 (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>
-rw-r--r-- | drivers/acpi/osl.c | 4 | ||||
-rw-r--r-- | drivers/acpi/tables.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 0796ad96dc32..0155f8b8a79a 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -56,10 +56,6 @@ struct acpi_os_dpc { | |||
56 | struct work_struct work; | 56 | struct work_struct work; |
57 | }; | 57 | }; |
58 | 58 | ||
59 | #ifdef CONFIG_ACPI_CUSTOM_DSDT | ||
60 | #include CONFIG_ACPI_CUSTOM_DSDT_FILE | ||
61 | #endif | ||
62 | |||
63 | #ifdef ENABLE_DEBUGGER | 59 | #ifdef ENABLE_DEBUGGER |
64 | #include <linux/kdb.h> | 60 | #include <linux/kdb.h> |
65 | 61 | ||
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 08795fbde3fa..a372f9eaa15d 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
@@ -36,6 +36,10 @@ | |||
36 | #include <linux/memblock.h> | 36 | #include <linux/memblock.h> |
37 | #include "internal.h" | 37 | #include "internal.h" |
38 | 38 | ||
39 | #ifdef CONFIG_ACPI_CUSTOM_DSDT | ||
40 | #include CONFIG_ACPI_CUSTOM_DSDT_FILE | ||
41 | #endif | ||
42 | |||
39 | #define ACPI_MAX_TABLES 128 | 43 | #define ACPI_MAX_TABLES 128 |
40 | 44 | ||
41 | static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" }; | 45 | static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" }; |