From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 5 May 2016 23:27:09 +0000 (+0200)
Subject: ACPI / tables: Fix DSDT override mechanism
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74216699ddcca13541e8494cb2b995e6a44a04d9;p=linux-beck.git

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

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 {
 	struct work_struct work;
 };
 
-#ifdef CONFIG_ACPI_CUSTOM_DSDT
-#include CONFIG_ACPI_CUSTOM_DSDT_FILE
-#endif
-
 #ifdef ENABLE_DEBUGGER
 #include <linux/kdb.h>
 
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 @@
 #include <linux/memblock.h>
 #include "internal.h"
 
+#ifdef CONFIG_ACPI_CUSTOM_DSDT
+#include CONFIG_ACPI_CUSTOM_DSDT_FILE
+#endif
+
 #define ACPI_MAX_TABLES		128
 
 static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };