Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/acpi/osl.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -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>

drivers/acpi/tables.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -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" };