summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/acpi.c
diff options
context:
space:
mode:
authorJesse Barnes2009-06-11 19:58:28 +0200
committerJesse Barnes2009-06-11 21:04:17 +0200
commit9e9f46c44e487af0a82eb61b624553e2f7118f5b (patch)
treededcd3a5107009d32cddd25875825e68bfba2797 /arch/x86/pci/acpi.c
parentPCI: remove deprecated pci_find_slot() interface (diff)
downloadkernel-qcow2-linux-9e9f46c44e487af0a82eb61b624553e2f7118f5b.tar.gz
kernel-qcow2-linux-9e9f46c44e487af0a82eb61b624553e2f7118f5b.tar.xz
kernel-qcow2-linux-9e9f46c44e487af0a82eb61b624553e2f7118f5b.zip
PCI: use ACPI _CRS data by default
At this point, it seems to solve more problems than it causes, so let's try using it by default. It's an easy revert if it ends up causing trouble. Reviewed-by: Yinghai Lu <yhlu.kernel@gmail.com> Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/acpi.c')
-rw-r--r--arch/x86/pci/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index c0ecf250fe51..8d898e0d3609 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -217,7 +217,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
#endif
}
- if (bus && (pci_probe & PCI_USE__CRS))
+ if (bus && !(pci_probe & PCI_NO_ROOT_CRS))
get_current_resources(device, busnum, domain, bus);
return bus;
}