---

yaml --- r: 324053 b: refs/heads/master c: bdd1fc2 h: refs/heads/master i: 324051: f8eaf6e v: v3
git-mirror · Sep 26, 2012 · 64bf09d · 64bf09d
1 parent 3e45fd3
commit 64bf09d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 843c48fd0fc8a63324d1a30255ac2750fa564937
+refs/heads/master: bdd1fc27cde35e092497ce8b2ff862bd3e8d27aa
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
@@ -634,16 +634,17 @@ source "arch/s390/kvm/Kconfig"
 
 config S390_GUEST
 	def_bool y
-	prompt "s390 guest support for KVM (EXPERIMENTAL)"
+	prompt "s390 support for virtio devices (EXPERIMENTAL)"
 	depends on 64BIT && EXPERIMENTAL
 	select VIRTUALIZATION
 	select VIRTIO
 	select VIRTIO_RING
 	select VIRTIO_CONSOLE
 	help
+	  Enabling this option adds support for virtio based paravirtual device
+	  drivers on s390.
+
 	  Select this option if you want to run the kernel as a guest under
-	  the KVM hypervisor. This will add detection for KVM as well  as a
-	  virtio transport. If KVM is detected, the virtio console will be
-	  the default console.
+	  the KVM hypervisor.
 
 endmenu