Merge branch 'tracing/core-v2' into tracing-for-linus

[sfrench/cifs-2.6.git] / arch / x86 / kvm / Kconfig

diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index b81125f0bdee21be384aeb058f3bb96d7fe767b7..a58504ea78ccb90d766e8efbcc5563ef0b0d1303 100644 (file)
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -4,6 +4,10 @@
 config HAVE_KVM
        bool
 
+config HAVE_KVM_IRQCHIP
+       bool
+       default y
+
 menuconfig VIRTUALIZATION
        bool "Virtualization"
        depends on HAVE_KVM || X86
@@ -55,7 +59,8 @@ config KVM_AMD
 
 config KVM_TRACE
        bool "KVM trace support"
-       depends on KVM && MARKERS && SYSFS
+       depends on KVM && SYSFS
+       select MARKERS
        select RELAY
        select DEBUG_FS
        default n