Skip to content

Commit 49db108

Browse files
andy-shevrafaeljw
authored andcommitted
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>
1 parent d85eb41 commit 49db108

3 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/acpi/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ acpi-y += event.o
5555
acpi-y += evged.o
5656
acpi-y += sysfs.o
5757
acpi-y += property.o
58-
acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
5958
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
6059
acpi-y += acpi_lpat.o
6160
acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o

drivers/acpi/x86/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
obj-$(CONFIG_ACPI) += acpi-x86.o
22
acpi-x86-y += apple.o
3+
acpi-x86-y += cmos_rtc.o
34
acpi-x86-y += s2idle.o
45
acpi-x86-y += utils.o
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/module.h>
1616
#include <linux/mc146818rtc.h>
1717

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

2020
static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
2121
{ "PNP0B00" },

0 commit comments

Comments
 (0)