diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 01:19:24 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 01:19:24 +0300 |
| commit | b735a1872c83db608aae7b3ef376b61f5d7de24c (patch) | |
| tree | efe3489a84d37da949069fe72d4e36e2b8976dba /drivers/pci/host/Makefile | |
| parent | 0fdf6766312c360e76210eb633e9919ed2390819 (diff) | |
| parent | ece3b3864848fa1a38c10078559c951886a2c1ea (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151022.0ll_20151022.0
Conflicting files:
arch/arm64/configs/defconfig
Diffstat (limited to 'drivers/pci/host/Makefile')
| -rw-r--r-- | drivers/pci/host/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index 140d66f796e4..451d49e3df44 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -17,3 +17,4 @@ obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o +obj-$(CONFIG_PCI_QCOM) += pci-qcom.o |