diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 11:46:53 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 11:46:53 -0500 |
commit | 805f91bc52269597c0808de260305a60309ae92e (patch) | |
tree | 62ae15aec14fb4ee12e39285589c637eba833928 /drivers/pci/controller/pci-xgene.c | |
parent | ed89d69a150660f3268c05ad51e715cd9e3009da (diff) | |
parent | 6943f3e3ffe537d2c4683c5c13a04e80798b9496 (diff) |
Merge branch 'pci/misc'
- Drop of_match_ptr() to avoid unused variables when CONFIG_OF is unset
(Bjorn Helgaas)
- Fix ARM pci_remap_iospace() when CONFIG_MMU unset to avoid build errors
(Pali Rohár)
* pci/misc:
PCI/ACPI: Update link to PCI firmware specification
PCI: Drop of_match_ptr() to avoid unused variables
Diffstat (limited to 'drivers/pci/controller/pci-xgene.c')
-rw-r--r-- | drivers/pci/controller/pci-xgene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c index eb6240958bb0..549d3bd6d1c2 100644 --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -641,7 +641,7 @@ static const struct of_device_id xgene_pcie_match_table[] = { static struct platform_driver xgene_pcie_driver = { .driver = { .name = "xgene-pcie", - .of_match_table = of_match_ptr(xgene_pcie_match_table), + .of_match_table = xgene_pcie_match_table, .suppress_bind_attrs = true, }, .probe = xgene_pcie_probe, |