Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH] PCI: always build pci-host-common on ARM64 | Date | Tue, 14 Feb 2017 22:42:56 +0100 |
| |
The Thunder PCI host driver is always built, but it relies on pci_host_common_probe, so we get a link error here:
drivers/pci/host/pci-thunder-pem.c: In function 'thunder_pem_probe': drivers/pci/host/pci-thunder-pem.c:412:9: error: implicit declaration of function 'pci_host_common_probe';did you mean 'pci_host_bridge_priv'? [-Werror=implicit-function-declaration]
This adds the common file to the existing hack.
Fixes: ca5ab37b19df ("PCI: Explain ARM64 ACPI/MCFG quirk Kconfig and build strategy") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/pci/host/Makefile | 2 +- include/linux/pci-ecam.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index bfe3179ae74c..e97d084f10ea 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -39,7 +39,7 @@ obj-$(CONFIG_VMD) += vmd.o # config options to be enabled, so we always build these drivers on # ARM64 and use internal ifdefs to only build the pieces we need # depending on whether ACPI, the DT driver, or both are enabled. - +obj-$(CONFIG_ARM64) += pci-host-common.o obj-$(CONFIG_ARM64) += pcie-hisi.o obj-$(CONFIG_ARM64) += pci-thunder-ecam.o obj-$(CONFIG_ARM64) += pci-thunder-pem.o diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h index f0d2b9451270..ab52692388d1 100644 --- a/include/linux/pci-ecam.h +++ b/include/linux/pci-ecam.h @@ -68,9 +68,8 @@ extern struct pci_ecam_ops xgene_v1_pcie_ecam_ops; /* APM X-Gene PCIe v1 */ extern struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */ #endif -#ifdef CONFIG_PCI_HOST_GENERIC /* for DT-based PCI controllers that support ECAM */ int pci_host_common_probe(struct platform_device *pdev, struct pci_ecam_ops *ops); -#endif + #endif -- 2.9.0
| |