diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-31 19:21:33 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-31 19:21:33 +0300 |
| commit | c7f75aecb2d9436c4bef8b413231f60deae3453c (patch) | |
| tree | ad6082d4a0d79226637af66ee8f2fc4b24590d4b /drivers/pci/host/Makefile | |
| parent | a07ae842e209196ffe0fe8feacd489aba772d8a0 (diff) | |
| parent | 37dddf14f1aecd9fa89a5136b38b33cab54b9195 (diff) | |
| download | linux-c7f75aecb2d9436c4bef8b413231f60deae3453c.tar.xz | |
Merge remote-tracking branch 'lorenzo/pci/cadence' into next
* lorenzo/pci/cadence:
PCI: cadence: Add EndPoint Controller driver for Cadence PCIe controller
dt-bindings: PCI: cadence: Add DT bindings for Cadence PCIe endpoint controller
PCI: endpoint: Fix EPF device name to support multi-function devices
PCI: endpoint: Add the function number as argument to EPC ops
PCI: cadence: Add host driver for Cadence PCIe controller
dt-bindings: PCI: cadence: Add DT bindings for Cadence PCIe host controller
PCI: Add vendor ID for Cadence
PCI: Add generic function to probe PCI host controllers
PCI: generic: fix missing call of pci_free_resource_list()
PCI: OF: Add generic function to parse and allocate PCI resources
PCI: Regroup all PCI related entries into drivers/pci/Makefile
Conflicts:
drivers/pci/of.c
include/linux/pci.h
Diffstat (limited to 'drivers/pci/host/Makefile')
| -rw-r--r-- | drivers/pci/host/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index 34ec1d88f961..3b1059190867 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -34,6 +34,8 @@ obj-$(CONFIG_VMD) += vmd.o # ARM64 and use internal ifdefs to only build the pieces we need # depending on whether ACPI, the DT driver, or both are enabled. +ifdef CONFIG_PCI obj-$(CONFIG_ARM64) += pci-thunder-ecam.o obj-$(CONFIG_ARM64) += pci-thunder-pem.o obj-$(CONFIG_ARM64) += pci-xgene.o +endif |