diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 19:46:53 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 19:46:53 +0300 |
commit | 805f91bc52269597c0808de260305a60309ae92e (patch) | |
tree | 62ae15aec14fb4ee12e39285589c637eba833928 /drivers/pci/controller/dwc/pci-keystone.c | |
parent | ed89d69a150660f3268c05ad51e715cd9e3009da (diff) | |
parent | 6943f3e3ffe537d2c4683c5c13a04e80798b9496 (diff) | |
download | linux-805f91bc52269597c0808de260305a60309ae92e.tar.xz |
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/dwc/pci-keystone.c')
-rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 2a9bbde224af..78818853af9e 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -1324,7 +1324,7 @@ static struct platform_driver ks_pcie_driver __refdata = { .remove = __exit_p(ks_pcie_remove), .driver = { .name = "keystone-pcie", - .of_match_table = of_match_ptr(ks_pcie_of_match), + .of_match_table = ks_pcie_of_match, }, }; builtin_platform_driver(ks_pcie_driver); |