Skip to content

Commit 3d26b94

Browse files
andy-shevrafaeljw
authored andcommitted
ACPI: x86: Move blacklist to x86 folder
blacklist is built solely for x86, move it to the respective folder. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 49db108 commit 3d26b94

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/acpi/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ tables.o: $(src)/../../include/$(CONFIG_ACPI_CUSTOM_DSDT_FILE) ;
1414
endif
1515

1616
obj-$(CONFIG_ACPI) += tables.o
17-
obj-$(CONFIG_X86) += blacklist.o
1817

1918
#
2019
# ACPI Core Subsystem (Interpreter)

drivers/acpi/x86/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ acpi-x86-y += apple.o
33
acpi-x86-y += cmos_rtc.o
44
acpi-x86-y += s2idle.o
55
acpi-x86-y += utils.o
6+
7+
obj-$(CONFIG_X86) += blacklist.o
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/acpi.h>
1818
#include <linux/dmi.h>
1919

20-
#include "internal.h"
20+
#include "../internal.h"
2121

2222
#ifdef CONFIG_DMI
2323
static const struct dmi_system_id acpi_rev_dmi_table[] __initconst;

0 commit comments

Comments
 (0)