1 files changed, 12 insertions, 2 deletions

diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 586f00059805..a47a3e54b964 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -21,14 +21,13 @@ config KVM
         tristate "Kernel-based Virtual Machine (KVM) support"
         depends on HAVE_KVM
         depends on HIGH_RES_TIMERS
-        # for device assignment:
-        depends on PCI
         # for TASKSTATS/TASK_DELAY_ACCT:
         depends on NET
         select PREEMPT_NOTIFIERS
         select MMU_NOTIFIER
         select ANON_INODES
         select HAVE_KVM_IRQCHIP
+        select HAVE_KVM_IRQ_ROUTING
         select HAVE_KVM_EVENTFD
         select KVM_APIC_ARCHITECTURE
         select KVM_ASYNC_PF
@@ -82,6 +81,17 @@ config KVM_MMU_AUDIT
          This option adds a R/W kVM module parameter 'mmu_audit', which allows
          audit  KVM MMU at runtime.
 
+config KVM_DEVICE_ASSIGNMENT
+        bool "KVM legacy PCI device assignment support"
+        depends on KVM && PCI && IOMMU_API
+        default y
+        ---help---
+          Provide support for legacy PCI device assignment through KVM.  The
+          kernel now also supports a full featured userspace device driver
+          framework through VFIO, which supersedes much of this support.
+
+          If unsure, say Y.
+
 # OK, it's a little counter-intuitive to do this, but it puts it neatly under
 # the virtualization menu.
 source drivers/vhost/Kconfig