diff options
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r-- | drivers/acpi/pci_root.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index c34713112520..3ba8d1f44a73 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/pm_runtime.h> | 33 | #include <linux/pm_runtime.h> |
34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
35 | #include <linux/pci-acpi.h> | 35 | #include <linux/pci-acpi.h> |
36 | #include <linux/pci-aspm.h> | ||
37 | #include <linux/acpi.h> | 36 | #include <linux/acpi.h> |
38 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
39 | #include <acpi/acpi_bus.h> | 38 | #include <acpi/acpi_bus.h> |
@@ -568,14 +567,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) | |||
568 | if (flags != base_flags) | 567 | if (flags != base_flags) |
569 | acpi_pci_osc_support(root, flags); | 568 | acpi_pci_osc_support(root, flags); |
570 | 569 | ||
571 | flags = OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL; | ||
572 | status = acpi_pci_osc_control_set(root->device->handle, &flags, flags); | ||
573 | |||
574 | if (ACPI_FAILURE(status)) { | ||
575 | printk(KERN_INFO "Unable to assume PCIe control: Disabling ASPM\n"); | ||
576 | pcie_no_aspm(); | ||
577 | } | ||
578 | |||
579 | pci_acpi_add_bus_pm_notifier(device, root->bus); | 570 | pci_acpi_add_bus_pm_notifier(device, root->bus); |
580 | if (device->wakeup.flags.run_wake) | 571 | if (device->wakeup.flags.run_wake) |
581 | device_set_run_wake(root->bus->bridge, true); | 572 | device_set_run_wake(root->bus->bridge, true); |