diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-11 13:58:28 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-11 15:04:17 -0400 |
commit | 9e9f46c44e487af0a82eb61b624553e2f7118f5b (patch) | |
tree | dedcd3a5107009d32cddd25875825e68bfba2797 /arch/x86/pci/common.c | |
parent | 3b073eda9557975a87a27b08a46a545fe8da66fb (diff) |
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/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 2202b6257b82..4740119e4bb7 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
@@ -515,8 +515,8 @@ char * __devinit pcibios_setup(char *str) | |||
515 | } else if (!strcmp(str, "assign-busses")) { | 515 | } else if (!strcmp(str, "assign-busses")) { |
516 | pci_probe |= PCI_ASSIGN_ALL_BUSSES; | 516 | pci_probe |= PCI_ASSIGN_ALL_BUSSES; |
517 | return NULL; | 517 | return NULL; |
518 | } else if (!strcmp(str, "use_crs")) { | 518 | } else if (!strcmp(str, "nocrs")) { |
519 | pci_probe |= PCI_USE__CRS; | 519 | pci_probe |= PCI_NO_ROOT_CRS; |
520 | return NULL; | 520 | return NULL; |
521 | } else if (!strcmp(str, "earlydump")) { | 521 | } else if (!strcmp(str, "earlydump")) { |
522 | pci_early_dump_regs = 1; | 522 | pci_early_dump_regs = 1; |