Merge branch 'pci/host-hv' into next

[linux-2.6-block.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 616165d72a17f6fdf66f6a080e4f4b8d70bd66b5..a1f37db745ab7fb2e8568fb8dc95df611d4cafe0 100644 (file)
--- 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"