diff options
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/acpi.c | 2 | ||||
| -rw-r--r-- | arch/x86/pci/amd_bus.c | 2 | ||||
| -rw-r--r-- | arch/x86/pci/common.c | 4 |
3 files changed, 4 insertions, 4 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 | } |
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index 2255f880678b..f893d6a6e803 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c | |||
| @@ -101,7 +101,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b) | |||
| 101 | struct pci_root_info *info; | 101 | struct pci_root_info *info; |
| 102 | 102 | ||
| 103 | /* don't go for it if _CRS is used */ | 103 | /* don't go for it if _CRS is used */ |
| 104 | if (!(pci_probe & PCI_NO_ROOT_CRS)) | 104 | if (pci_probe & PCI_USE__CRS) |
| 105 | return; | 105 | return; |
| 106 | 106 | ||
| 107 | /* if only one root bus, don't need to anything */ | 107 | /* if only one root bus, don't need to anything */ |
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) | |||
| 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, "nocrs")) { | 518 | } else if (!strcmp(str, "use_crs")) { |
| 519 | pci_probe |= PCI_NO_ROOT_CRS; | 519 | pci_probe |= PCI_USE__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; |
