diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 12:04:23 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 12:04:23 +0300 |
| commit | 3eb85368460d942005ba305829e279d0fe4767e0 (patch) | |
| tree | e4498b245f5dff9fa6836413ccb10f6df971df30 /drivers/acpi/Kconfig | |
| parent | 4cd9da8ad1c98a2c9c2b30cbd5c40faba0047bae (diff) | |
| parent | 5c6a1177826e5207306511a480b5aae79fd0fefb (diff) | |
| download | linux-3eb85368460d942005ba305829e279d0fe4767e0.tar.xz | |
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/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 618afeefbc73..7b65a807b3dd 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -9,7 +9,6 @@ config ARCH_SUPPORTS_ACPI menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on ARCH_SUPPORTS_ACPI - depends on PCI select PNP default y if X86 help @@ -370,7 +369,7 @@ config ACPI_DEBUG config ACPI_PCI_SLOT bool "PCI slot detection driver" - depends on SYSFS + depends on SYSFS && PCI help This driver creates entries in /sys/bus/pci/slots/ for all PCI slots in the system. This can help correlate PCI bus addresses, |