diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-05 21:00:21 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-05 21:00:21 +0200 |
| commit | bdf530984d10b6b88b10a6d03057409a3f1c6897 (patch) | |
| tree | 9ae670861f37cd57c21d92bf6fb1b50c4cacd2f6 /drivers/pci/host/Makefile | |
| parent | Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-artpec', 'pc... (diff) | |
| parent | x86/PCI: VMD: Move VMD driver to drivers/pci/host (diff) | |
| download | linux-bdf530984d10b6b88b10a6d03057409a3f1c6897.tar.xz linux-bdf530984d10b6b88b10a6d03057409a3f1c6897.zip | |
Merge branch 'pci/host-vmd' into next
* pci/host-vmd:
x86/PCI: VMD: Move VMD driver to drivers/pci/host
x86/PCI: VMD: Synchronize with RCU freeing MSI IRQ descs
x86/PCI: VMD: Eliminate index member from IRQ list
x86/PCI: VMD: Eliminate vmd_vector member from list type
x86/PCI: VMD: Convert to use pci_alloc_irq_vectors() API
x86/PCI: VMD: Allocate IRQ lists with correct MSI-X count
PCI: Use positive flags in pci_alloc_irq_vectors()
PCI: Update "pci=resource_alignment" documentation
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
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 a8afc16b0299..084cb4983645 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -32,3 +32,4 @@ obj-$(CONFIG_PCI_HOST_THUNDER_PEM) += pci-thunder-pem.o obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o +obj-$(CONFIG_VMD) += vmd.o |