diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-04-21 03:35:40 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-04-23 00:06:29 +0200 |
| commit | b10ceb5530df7ee6e81f92910589a34dd3e5690b (patch) | |
| tree | 7abe2e5b6a755dc9c9e07356cd74900eb9e69731 /arch/x86 | |
| parent | docbooks: add/fix PCI kernel-doc (diff) | |
| download | linux-b10ceb5530df7ee6e81f92910589a34dd3e5690b.tar.xz linux-b10ceb5530df7ee6e81f92910589a34dd3e5690b.zip | |
x86/PCI: don't bother with root quirks if _CRS is used
It will be overwriten later if _CRS is used, so don't bother to set it.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/pci/amd_bus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index e121ee050f7c..f893d6a6e803 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -100,6 +100,10 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b) int j; struct pci_root_info *info; + /* don't go for it if _CRS is used */ + if (pci_probe & PCI_USE__CRS) + return; + /* if only one root bus, don't need to anything */ if (pci_root_num < 2) return; |