diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
| commit | 6e02d8833338866388a3732e65eed1ff72a75a60 (patch) | |
| tree | 77b3407d7bdc182d751ed5440215c3f0aca1427d /drivers/acpi/pci_root.c | |
| parent | 2f7d3ee28cb91bcc63890dbb7f63fde4c63e2340 (diff) | |
| parent | 97f32419d57c154fcc2cda75f65ce06a5920b72d (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linux-linaro-lsk-v4.9-test
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index bf601d4df8cf..b66815f35be6 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -472,9 +472,11 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm) } control = OSC_PCI_EXPRESS_CAPABILITY_CONTROL - | OSC_PCI_EXPRESS_NATIVE_HP_CONTROL | OSC_PCI_EXPRESS_PME_CONTROL; + if (IS_ENABLED(CONFIG_HOTPLUG_PCI_PCIE)) + control |= OSC_PCI_EXPRESS_NATIVE_HP_CONTROL; + if (pci_aer_available()) { if (aer_acpi_firmware_first()) dev_info(&device->dev, |