tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Andy Shevchenko and committed by
Rafael J. Wysocki 2d5d5abe 3d26b94f

+4 -3
-1
drivers/acpi/Makefile
··· 45 45 acpi-$(CONFIG_ACPI_DOCK) += dock.o 46 46 acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o 47 47 obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o 48 - acpi-$(CONFIG_PCI) += acpi_lpss.o 49 48 acpi-y += acpi_apd.o 50 49 acpi-y += acpi_platform.o 51 50 acpi-y += acpi_pnp.o
+1 -1
drivers/acpi/acpi_lpss.c drivers/acpi/x86/lpss.c
··· 25 25 #include <linux/suspend.h> 26 26 #include <linux/delay.h> 27 27 28 - #include "internal.h" 28 + #include "../internal.h" 29 29 30 30 #ifdef CONFIG_X86_INTEL_LPSS 31 31
+2 -1
drivers/acpi/internal.h
··· 69 69 #else 70 70 static inline void acpi_debugfs_init(void) { return; } 71 71 #endif 72 - #ifdef CONFIG_PCI 72 + 73 + #if defined(CONFIG_X86) && defined(CONFIG_PCI) 73 74 void acpi_lpss_init(void); 74 75 #else 75 76 static inline void acpi_lpss_init(void) {}
+1
drivers/acpi/x86/Makefile
··· 1 1 obj-$(CONFIG_ACPI) += acpi-x86.o 2 2 acpi-x86-y += apple.o 3 3 acpi-x86-y += cmos_rtc.o 4 + acpi-x86-$(CONFIG_PCI) += lpss.o 4 5 acpi-x86-y += s2idle.o 5 6 acpi-x86-y += utils.o 6 7