ACPI: x86: Move acpi_cmos_rtc to x86 folder

acpi_cmos_rtc 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>

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index f84de92b07136cf59e166ebd5d9258bb1b1d9189..5e14aa11c2cbf9e7d546a18b301e1c9b2482b3cb 100644 (file)
--- 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 bd17dd2c2c5bbf23ed7a7350e6209dd913161c62..b97b1bcf84049504fdcb8bbd7863ba453e768b7f 100644 (file)
--- 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 9b55d1593d160c86430dddcced2ddb4b2248955b..51643ff6fe5fc457c37a0d97f262a961b2358f1a 100644 (file)
--- 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" },