Merge remote-tracking branch 'xen-tip/linux-next'

[karo-tx-linux.git] / arch / arm / kvm / Kconfig

diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index 210eccadb69a9770ba1b51beb077bb071f565261..95a000515e43286f822f541fe411902df42bdeb8 100644 (file)
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -21,6 +21,7 @@ config KVM
        depends on MMU && OF
        select PREEMPT_NOTIFIERS
        select ANON_INODES
+       select ARM_GIC
        select HAVE_KVM_CPU_RELAX_INTERCEPT
        select HAVE_KVM_ARCH_TLB_FLUSH_ALL
        select KVM_MMIO
@@ -45,4 +46,6 @@ config KVM_ARM_HOST
        ---help---
          Provides host support for ARM processors.
 
+source drivers/vhost/Kconfig
+
 endif # VIRTUALIZATION