diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2024-04-04 21:23:42 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-04-08 16:39:24 +0200 |
| commit | 2d5d5abebf1a342d672f738b60ea930ebc1070b0 (patch) | |
| tree | 6683d735fed169e315bbe0dc88df9ba98c89492e | |
| parent | 3d26b94fa11e5e7aa46aef5ee7748d5015900acd (diff) | |
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>
| -rw-r--r-- | drivers/acpi/Makefile | 1 | ||||
| -rw-r--r-- | drivers/acpi/internal.h | 3 | ||||
| -rw-r--r-- | drivers/acpi/x86/Makefile | 1 | ||||
| -rw-r--r-- | drivers/acpi/x86/lpss.c (renamed from drivers/acpi/acpi_lpss.c) | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 0f73a6b953b3..2046f108a91a 100644 --- 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 ca72a0dc5715..60c483836756 100644 --- 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 1f3c5fa84f9e..63c99509ed9d 100644 --- 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 index a3d2d94be5c0..148e29c2c526 100644 --- 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 |