Skip to content

Commit 2d5d5ab

Browse files
andy-shevrafaeljw
authored andcommitted
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>
1 parent 3d26b94 commit 2d5d5ab

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/acpi/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ acpi-y += ec.o
4545
acpi-$(CONFIG_ACPI_DOCK) += dock.o
4646
acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o
4747
obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o
48-
acpi-$(CONFIG_PCI) += acpi_lpss.o
4948
acpi-y += acpi_apd.o
5049
acpi-y += acpi_platform.o
5150
acpi-y += acpi_pnp.o

drivers/acpi/internal.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ void acpi_debugfs_init(void);
6969
#else
7070
static inline void acpi_debugfs_init(void) { return; }
7171
#endif
72-
#ifdef CONFIG_PCI
72+
73+
#if defined(CONFIG_X86) && defined(CONFIG_PCI)
7374
void acpi_lpss_init(void);
7475
#else
7576
static inline void acpi_lpss_init(void) {}

drivers/acpi/x86/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
obj-$(CONFIG_ACPI) += acpi-x86.o
22
acpi-x86-y += apple.o
33
acpi-x86-y += cmos_rtc.o
4+
acpi-x86-$(CONFIG_PCI) += lpss.o
45
acpi-x86-y += s2idle.o
56
acpi-x86-y += utils.o
67

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/suspend.h>
2626
#include <linux/delay.h>
2727

28-
#include "internal.h"
28+
#include "../internal.h"
2929

3030
#ifdef CONFIG_X86_INTEL_LPSS
3131

0 commit comments

Comments
 (0)