@@ -45,7 +45,6 @@ acpi-y += ec.o
acpi-$(CONFIG_ACPI_DOCK) += dock.o
acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o
obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o
-acpi-$(CONFIG_PCI) += acpi_lpss.o
acpi-y += acpi_apd.o
acpi-y += acpi_platform.o
acpi-y += acpi_pnp.o
@@ -1,6 +1,7 @@
obj-$(CONFIG_ACPI) += acpi-x86.o
acpi-x86-y += apple.o
acpi-x86-y += cmos_rtc.o
+acpi-x86-$(CONFIG_PCI) += lpss.o
acpi-x86-y += s2idle.o
acpi-x86-y += utils.o
similarity index 99%
rename from drivers/acpi/acpi_lpss.c
rename to drivers/acpi/x86/lpss.c
@@ -25,7 +25,7 @@
#include <linux/suspend.h>
#include <linux/delay.h>
-#include "internal.h"
+#include "../internal.h"
#ifdef CONFIG_X86_INTEL_LPSS
LPSS 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_lpss.c => x86/lpss.c} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%)