diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:04:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:04:23 +0100 |
| commit | 3eb85368460d942005ba305829e279d0fe4767e0 (patch) | |
| tree | e4498b245f5dff9fa6836413ccb10f6df971df30 /drivers/acpi/acpica/Makefile | |
| parent | Merge branches 'acpi-tables', 'acpi-soc', 'acpi-apei' and 'acpi-misc' (diff) | |
| parent | ACPI: Make PCI slot detection driver depend on PCI (diff) | |
| download | linux-dev-3eb85368460d942005ba305829e279d0fe4767e0.tar.xz linux-dev-3eb85368460d942005ba305829e279d0fe4767e0.zip | |
Merge branch 'acpi-pci'
* acpi-pci:
ACPI: Make PCI slot detection driver depend on PCI
ACPI/IORT: Stub out ACS functions when CONFIG_PCI is not set
arm64: select ACPI PCI code only when both features are enabled
PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set
ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset
ACPI: Allow CONFIG_PCI to be unset for reboot
ACPI: Move PCI reset to a separate function
Diffstat (limited to 'drivers/acpi/acpica/Makefile')
| -rw-r--r-- | drivers/acpi/acpica/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index b14621da5413..59700433a96e 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile @@ -77,13 +77,13 @@ acpi-y += \ hwacpi.o \ hwesleep.o \ hwgpe.o \ - hwpci.o \ hwregs.o \ hwsleep.o \ hwvalid.o \ hwxface.o \ hwxfsleep.o +acpi-$(CONFIG_PCI) += hwpci.o acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o acpi-y += \ |