ACPI: x86: Move LPSS to x86 folder

LPSS 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 0f73a6b953b3309c08742885e55a5408c4ea29f1..2046f108a91ac78d3f6bbc231c2fdef8ba33a2e4 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -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

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index ca72a0dc57151a15eef2ce02039de40dfa510611..60c483836756d54ea8e87e26f758729a7b6d10cf 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -69,7 +69,8 @@ void acpi_debugfs_init(void);
 #else
 static inline void acpi_debugfs_init(void) { return; }
 #endif
-#ifdef CONFIG_PCI
+
+#if defined(CONFIG_X86) && defined(CONFIG_PCI)
 void acpi_lpss_init(void);
 #else
 static inline void acpi_lpss_init(void) {}

diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
index 1f3c5fa84f9e1a63541fc33aba8ed30589b70f14..63c99509ed9de64ef06f81ba269c730695675079 100644 (file)
--- a/drivers/acpi/x86/Makefile
+++ b/drivers/acpi/x86/Makefile
@@ -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
 

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/x86/lpss.c
similarity index 99%
rename from drivers/acpi/acpi_lpss.c
rename to drivers/acpi/x86/lpss.c
index a3d2d94be5c0d05ea7c71dad32ae5db1a5acfc6f..148e29c2c526cb4742c143b185703293026c4673 100644 (file)
--- a/drivers/acpi/acpi_lpss.c
+++ b/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