Merge branch 'master' into tk71

[mv-sheeva.git] / arch / s390 / kvm / Kconfig

diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index a7251580891cfef25483e683460d58f498eb65b6..f66a1bdbb61dfe127a14cb282201cb40bef33777 100644 (file)
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -4,8 +4,8 @@
 source "virt/kvm/Kconfig"
 
 menuconfig VIRTUALIZATION
-       bool "Virtualization"
-       default y
+       def_bool y
+       prompt "Virtualization"
        ---help---
          Say Y here to get to see options for using your Linux host to run other
          operating systems inside virtual machines (guests).
@@ -16,7 +16,8 @@ menuconfig VIRTUALIZATION
 if VIRTUALIZATION
 
 config KVM
-       tristate "Kernel-based Virtual Machine (KVM) support"
+       def_tristate y
+       prompt "Kernel-based Virtual Machine (KVM) support"
        depends on HAVE_KVM && EXPERIMENTAL
        select PREEMPT_NOTIFIERS
        select ANON_INODES