diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-18 13:17:16 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-18 13:17:16 +0300 |
| commit | 11ee2a3808aebbec73096551a716dea03d417fcb (patch) | |
| tree | 4675f5d2f11de09319213cb36aee4184a6df7fd0 /arch | |
| parent | b1c0330823fe842dbb34641f1410f0afa51c29d3 (diff) | |
| parent | 6f9b5e70dfcde983192155549f584472aa9f54cd (diff) | |
| download | linux-11ee2a3808aebbec73096551a716dea03d417fcb.tar.xz | |
Merge branch 'acpi-pci'
* acpi-pci:
drivers: thermal: int340x_thermal: Make PCI dependency explicit
x86/intel/lpss: Make PCI dependency explicit
platform/x86: apple-gmux: Make PCI dependency explicit
platform/x86: intel_pmc: Make PCI dependency explicit
platform/x86: intel_ips: make PCI dependency explicit
vga-switcheroo: make PCI dependency explicit
ata: pata_acpi: Make PCI dependency explicit
ACPI / LPSS: Make PCI dependency explicit
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 15af091611e2..4b4a7f32b68e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -617,7 +617,7 @@ config X86_INTEL_QUARK config X86_INTEL_LPSS bool "Intel Low Power Subsystem Support" - depends on X86 && ACPI + depends on X86 && ACPI && PCI select COMMON_CLK select PINCTRL select IOSF_MBI |