summaryrefslogtreecommitdiffstats
path: root/drivers/pci/Kconfig
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-03-15 08:56:16 -0500
committerBjorn Helgaas <bhelgaas@google.com>2016-03-15 08:56:16 -0500
commitcfeb8139a1fbbbae3f1e986133f4e9e7833eeac4 (patch)
tree0f3a162561d9a64cf4f509fb516f2d58f70530d9 /drivers/pci/Kconfig
parent562df5c8521e1371f3cbd0b7b868034da376d714 (diff)
parent4daace0d8ce851f8f8f91563c835e3000c954d5e (diff)
downloadlinux-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.tar.gz
linux-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.tar.bz2
linux-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/Kconfig')
-rw-r--r--drivers/pci/Kconfig8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 616165d72a17..a1f37db745ab 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -121,5 +121,11 @@ config PCI_LABEL
def_bool y if (DMI || ACPI)
select NLS
-source "drivers/pci/hotplug/Kconfig"
+config PCI_HYPERV
+ tristate "Hyper-V PCI Frontend"
+ depends on PCI && X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64
+ help
+ The PCI device frontend driver allows the kernel to import arbitrary
+ PCI devices from a PCI backend to support PCI driver domains.
+
source "drivers/pci/host/Kconfig"