diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 19:23:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 19:23:03 -0400 |
commit | 236e946b53ffd5e2f5d7e6abebbe72a9f0826d15 (patch) | |
tree | b50c372fd90fe736f7d29aab15fbb3b13780acd8 /arch/x86/pci/acpi.c | |
parent | f27884aeadff9654f4a1e8a05dd92f4b140afe29 (diff) |
Revert "PCI: use ACPI _CRS data by default"
This reverts commit 9e9f46c44e487af0a82eb61b624553e2f7118f5b.
Quoting from the commit message:
"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."
And guess what? The _CRS code causes trouble.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/pci/acpi.c')
-rw-r--r-- | arch/x86/pci/acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 16c3fda85bba..b26626dc517c 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
@@ -238,7 +238,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do | |||
238 | #endif | 238 | #endif |
239 | } | 239 | } |
240 | 240 | ||
241 | if (bus && !(pci_probe & PCI_NO_ROOT_CRS)) | 241 | if (bus && (pci_probe & PCI_USE__CRS)) |
242 | get_current_resources(device, busnum, domain, bus); | 242 | get_current_resources(device, busnum, domain, bus); |
243 | return bus; | 243 | return bus; |
244 | } | 244 | } |