diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 15:31:15 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 15:31:15 -0600 |
| commit | cdf4f4dc118bafd97d0148d53730e396ece11afa (patch) | |
| tree | 91f12d628f1ec43fee71da3269b8fe0ad7d4b4e8 /drivers/pci/controller/dwc/Makefile | |
| parent | c266b026ae7a51f876eb74e15ff63f834fe35976 (diff) | |
| parent | 7e6d5cd88a6f4961ed2968799ef98528c13ac5f8 (diff) | |
| download | lwn-cdf4f4dc118bafd97d0148d53730e396ece11afa.tar.gz lwn-cdf4f4dc118bafd97d0148d53730e396ece11afa.zip | |
Merge branch 'remotes/lorenzo/pci/uniphier'
- Add UniPhier PCIe controller driver and DT bindings (Kunihiko Hayashi)
* remotes/lorenzo/pci/uniphier:
PCI: uniphier: Add UniPhier PCIe host controller support
dt-bindings: PCI: Add UniPhier PCIe host controller description
# Conflicts:
# drivers/pci/controller/dwc/Kconfig
# drivers/pci/controller/dwc/Makefile
Diffstat (limited to 'drivers/pci/controller/dwc/Makefile')
| -rw-r--r-- | drivers/pci/controller/dwc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/controller/dwc/Makefile b/drivers/pci/controller/dwc/Makefile index e05a0153ffc4..7bcdcdf5024e 100644 --- a/drivers/pci/controller/dwc/Makefile +++ b/drivers/pci/controller/dwc/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o obj-$(CONFIG_PCI_MESON) += pci-meson.o +obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o # The following drivers are for devices that use the generic ACPI # pci_root.c driver but don't support standard ECAM config access. |