From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Zhang Rui <rui.zhang@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael@kernel.org>, Len Brown <lenb@kernel.org>
Subject: [PATCH v1 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder
Date: Wed, 3 Apr 2024 19:54:36 +0300 [thread overview]
Message-ID: <20240403170302.1073841-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com>
acpi_cmos_rtc is built solely for x86, move it to the respective folder.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
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
next prev parent reply other threads:[~2024-04-03 17:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 16:54 [PATCH v1 0/4] ACPI: x86: Move x86 stuff into dedicated folder Andy Shevchenko
2024-04-03 16:54 ` [PATCH v1 1/4] ACPI: x86: Introduce a Makefile Andy Shevchenko
2024-04-03 16:54 ` Andy Shevchenko [this message]
2024-04-03 16:54 ` [PATCH v1 3/4] ACPI: x86: Move blacklist to x86 folder Andy Shevchenko
2024-04-03 16:54 ` [PATCH v1 4/4] ACPI: x86: Move LPSS " Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240403170302.1073841-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.