diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 18:45:47 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 18:45:47 +0200 |
| commit | b7c18dc06ad12059abc0961522d446553f8a755b (patch) | |
| tree | d5d94228ffacb6df390e7fa7d92c0901a0665ea4 /drivers/pci/Makefile | |
| parent | Merge branch 'remotes/lorenzo/pci/cadence' (diff) | |
| parent | PCI: aardvark: Implement emulated root PCI bridge config space (diff) | |
| download | linux-b7c18dc06ad12059abc0961522d446553f8a755b.tar.xz linux-b7c18dc06ad12059abc0961522d446553f8a755b.zip | |
Merge branch 'remotes/lorenzo/pci/controller-misc'
- Remove redundant controller tests for "device_type == pci" (Rob
Herring)
- Document R-Car E3 (R8A77990) bindings (Tho Vu)
- Add device tree support for R-Car r8a7744 (Biju Das)
- Drop unused mvebu PCIe capability code (Thomas Petazzoni)
- Add shared PCI bridge emulation code (Thomas Petazzoni)
- Convert mvebu to use shared PCI bridge emulation (Thomas Petazzoni)
- Add aardvark Root Port emulation (Thomas Petazzoni)
* remotes/lorenzo/pci/controller-misc:
PCI: aardvark: Implement emulated root PCI bridge config space
PCI: mvebu: Convert to PCI emulated bridge config space
PCI: mvebu: Drop unused PCI express capability code
PCI: Introduce PCI bridge emulated config space common logic
dt-bindings: PCI: rcar: Add device tree support for r8a7744
dt-bindings: PCI: rcar: Add device tree support for r8a7744
DT: pci: rcar-pci: document R8A77990 bindings
PCI: Remove unnecessary check of device_type == pci
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 85f4a703b2be..f2bda77a2df1 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ obj-$(CONFIG_PCI_MSI) += msi.o obj-$(CONFIG_PCI_ATS) += ats.o obj-$(CONFIG_PCI_IOV) += iov.o +obj-$(CONFIG_PCI_BRIDGE_EMUL) += pci-bridge-emul.o obj-$(CONFIG_ACPI) += pci-acpi.o obj-$(CONFIG_PCI_LABEL) += pci-label.o obj-$(CONFIG_X86_INTEL_MID) += pci-mid.o |