Commit 2d5d5abe authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki

ACPI: x86: Move LPSS to x86 folder

LPSS is built solely for x86, move it to the respective folder.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3d26b94f
...@@ -45,7 +45,6 @@ acpi-y += ec.o ...@@ -45,7 +45,6 @@ acpi-y += ec.o
acpi-$(CONFIG_ACPI_DOCK) += dock.o acpi-$(CONFIG_ACPI_DOCK) += dock.o
acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o
obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o
acpi-$(CONFIG_PCI) += acpi_lpss.o
acpi-y += acpi_apd.o acpi-y += acpi_apd.o
acpi-y += acpi_platform.o acpi-y += acpi_platform.o
acpi-y += acpi_pnp.o acpi-y += acpi_pnp.o
......
...@@ -69,7 +69,8 @@ void acpi_debugfs_init(void); ...@@ -69,7 +69,8 @@ void acpi_debugfs_init(void);
#else #else
static inline void acpi_debugfs_init(void) { return; } static inline void acpi_debugfs_init(void) { return; }
#endif #endif
#ifdef CONFIG_PCI
#if defined(CONFIG_X86) && defined(CONFIG_PCI)
void acpi_lpss_init(void); void acpi_lpss_init(void);
#else #else
static inline void acpi_lpss_init(void) {} static inline void acpi_lpss_init(void) {}
......
obj-$(CONFIG_ACPI) += acpi-x86.o obj-$(CONFIG_ACPI) += acpi-x86.o
acpi-x86-y += apple.o acpi-x86-y += apple.o
acpi-x86-y += cmos_rtc.o acpi-x86-y += cmos_rtc.o
acpi-x86-$(CONFIG_PCI) += lpss.o
acpi-x86-y += s2idle.o acpi-x86-y += s2idle.o
acpi-x86-y += utils.o acpi-x86-y += utils.o
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "internal.h" #include "../internal.h"
#ifdef CONFIG_X86_INTEL_LPSS #ifdef CONFIG_X86_INTEL_LPSS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment