diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 01:23:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 01:23:03 +0200 |
| commit | 236e946b53ffd5e2f5d7e6abebbe72a9f0826d15 (patch) | |
| tree | b50c372fd90fe736f7d29aab15fbb3b13780acd8 /arch/x86/pci/common.c | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| download | linux-236e946b53ffd5e2f5d7e6abebbe72a9f0826d15.tar.xz linux-236e946b53ffd5e2f5d7e6abebbe72a9f0826d15.zip | |
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/common.c')
| -rw-r--r-- | arch/x86/pci/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 4740119e4bb7..2202b6257b82 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -515,8 +515,8 @@ char * __devinit pcibios_setup(char *str) } else if (!strcmp(str, "assign-busses")) { pci_probe |= PCI_ASSIGN_ALL_BUSSES; return NULL; - } else if (!strcmp(str, "nocrs")) { - pci_probe |= PCI_NO_ROOT_CRS; + } else if (!strcmp(str, "use_crs")) { + pci_probe |= PCI_USE__CRS; return NULL; } else if (!strcmp(str, "earlydump")) { pci_early_dump_regs = 1; |