diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:25 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:25 +0300 |
| commit | ccfc1d557023af3f53da954402f9784cea2597d7 (patch) | |
| tree | 4df29d45eabd3cb7540264b4a869fc5793117ba2 /arch | |
| parent | 22d106733a2579f68b19170f575f786bbfbf88f3 (diff) | |
| parent | ccd61f07d28912dcd6a61ea73f5d69af7ad88efa (diff) | |
| download | linux-ccfc1d557023af3f53da954402f9784cea2597d7.tar.xz | |
Merge branch 'pci/misc'
- Fix compile testing of al driver without CONFIG_PCI_ECAM (Arnd Bergmann)
- Fix compile testing of thunder drivers (Arnd Bergmann)
- Fix "no symbols" warnings when compile testing al, thunder driver with
CONFIG_TRIM_UNUSED_KSYMS (Arnd Bergmann)
- Remove unused MicroGate SyncLink device IDs (Jiri Slaby)
- Remove unused alloc_pci_root_info() return value (Krzysztof Wilczyński)
* pci/misc:
x86/PCI: Remove unused alloc_pci_root_info() return value
PCI: Remove MicroGate SyncLink device IDs
PCI: Avoid building empty drivers
PCI: thunder: Fix compile testing
PCI: al: Select CONFIG_PCI_ECAM
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/pci/amd_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index bfa50e65ef6c..ae744b6a0785 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -126,7 +126,7 @@ static int __init early_root_info_init(void) node = (reg >> 4) & 0x07; link = (reg >> 8) & 0x03; - info = alloc_pci_root_info(min_bus, max_bus, node, link); + alloc_pci_root_info(min_bus, max_bus, node, link); } /* |