Skip to content

Commit 7421669

Browse files
committed
ACPI / tables: Fix DSDT override mechanism
Commit 5ae74f2 (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: 5ae74f2 (ACPI / tables: Move table override mechanisms to tables.c) Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Lv Zheng <[email protected]>
1 parent 5d88132 commit 7421669

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/acpi/osl.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ struct acpi_os_dpc {
5656
struct work_struct work;
5757
};
5858

59-
#ifdef CONFIG_ACPI_CUSTOM_DSDT
60-
#include CONFIG_ACPI_CUSTOM_DSDT_FILE
61-
#endif
62-
6359
#ifdef ENABLE_DEBUGGER
6460
#include <linux/kdb.h>
6561

drivers/acpi/tables.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
#include <linux/memblock.h>
3737
#include "internal.h"
3838

39+
#ifdef CONFIG_ACPI_CUSTOM_DSDT
40+
#include CONFIG_ACPI_CUSTOM_DSDT_FILE
41+
#endif
42+
3943
#define ACPI_MAX_TABLES 128
4044

4145
static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };

0 commit comments

Comments
 (0)