[PATCH v2 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder

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


acpi_cmos_rtc 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 | 1 +
drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%)

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 0db88aab309f..413c18e2bf61 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -55,7 +55,6 @@ acpi-y += event.o
acpi-y += evged.o
acpi-y += sysfs.o
acpi-y += property.o
-acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
acpi-y += acpi_lpat.o
acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o
diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
index bd17dd2c2c5b..b97b1bcf8404 100644
--- a/drivers/acpi/x86/Makefile
+++ b/drivers/acpi/x86/Makefile
@@ -1,4 +1,5 @@
obj-$(CONFIG_ACPI) += acpi-x86.o
acpi-x86-y += apple.o
+acpi-x86-y += cmos_rtc.o
acpi-x86-y += s2idle.o
acpi-x86-y += utils.o
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/x86/cmos_rtc.c
similarity index 98%
rename from drivers/acpi/acpi_cmos_rtc.c
rename to drivers/acpi/x86/cmos_rtc.c
index 9b55d1593d16..51643ff6fe5f 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/x86/cmos_rtc.c
@@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/mc146818rtc.h>

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

static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
{ "PNP0B00" },
--
2.43.0.rc1.1.gbec44491f096