diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:56:16 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:56:16 -0500 |
commit | cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4 (patch) | |
tree | 0f3a162561d9a64cf4f509fb516f2d58f70530d9 /drivers/pci/host/Makefile | |
parent | 562df5c8521e1371f3cbd0b7b868034da376d714 (diff) | |
parent | 4daace0d8ce851f8f8f91563c835e3000c954d5e (diff) | |
download | linux-stable-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.tar.gz linux-stable-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.tar.bz2 linux-stable-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.zip |
Merge branch 'pci/host-hv' into next
* pci/host-hv:
PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs
PCI: Look up IRQ domain by fwnode_handle
PCI: Add fwnode_handle to x86 pci_sysdata
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 3ccd743e20b9..d85b5faf9bbc 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o obj-$(CONFIG_PCI_IMX6) += pci-imx6.o +obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o |