[PATCH v2 3/4] ACPI: x86: Move blacklist to x86 folder

From: Andy Shevchenko
Date: Thu Apr 04 2024 - 14:35:20 EST


blacklist is built solely for x86, move it to the respective folder.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/acpi/Makefile | 1 -
drivers/acpi/x86/Makefile | 2 ++
drivers/acpi/{ => x86}/blacklist.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
rename drivers/acpi/{ => x86}/blacklist.c (99%)

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 413c18e2bf61..6f4187a34f41 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -14,7 +14,6 @@ tables.o: $(src)/../../include/$(CONFIG_ACPI_CUSTOM_DSDT_FILE) ;
endif

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

#
# ACPI Core Subsystem (Interpreter)
diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
index b97b1bcf8404..1f3c5fa84f9e 100644
--- a/drivers/acpi/x86/Makefile
+++ b/drivers/acpi/x86/Makefile
@@ -3,3 +3,5 @@ acpi-x86-y += apple.o
acpi-x86-y += cmos_rtc.o
acpi-x86-y += s2idle.o
acpi-x86-y += utils.o
+
+obj-$(CONFIG_X86) += blacklist.o
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/x86/blacklist.c
similarity index 99%
rename from drivers/acpi/blacklist.c
rename to drivers/acpi/x86/blacklist.c
index a558d24fb788..55214d0a12b1 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/x86/blacklist.c
@@ -17,7 +17,7 @@
#include <linux/acpi.h>
#include <linux/dmi.h>

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

#ifdef CONFIG_DMI
static const struct dmi_system_id acpi_rev_dmi_table[] __initconst;
--
2.43.0.rc1.1.gbec44491f096