--- /dev/null
+From eb9188bdb9d65aeead2382ec3dd656a17ec8936d Mon Sep 17 00:00:00 2001
+From: Andrew Patterson <andrew.patterson@hp.com>
+Date: Mon, 10 Nov 2008 15:31:00 -0700
+Subject: ACPI/PCI: PCIe AER _OSC support capabilities called when root bridge added
+Patch-mainline: 2.6.29
+References: bnc#438941
+
+The _OSC capability OSC_EXT_PCI_CONFIG_SUPPORT is set when the root
+bridge is added with pci_acpi_osc_support(), so we no longer need to do
+it in the PCIe AER driver.
+
+Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
++++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
+@@ -38,7 +38,6 @@ int aer_osc_setup(struct pcie_device *pciedev)
+
+ handle = acpi_find_root_bridge_handle(pdev);
+ if (handle) {
+- pcie_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT);
+ status = pci_osc_control_set(handle,
+ OSC_PCI_EXPRESS_AER_CONTROL |
+ OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);