diff --git a/[refs] b/[refs]
index 157bad4dc5f7..256568318a9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd0ac4eb469ef58c3b1746fccd15da871fc55c4
+refs/heads/master: 99e65c92f2bbf84f43766a8bf701e36817d62822
diff --git a/trunk/drivers/s390/kvm/Makefile b/trunk/drivers/s390/kvm/Makefile
index 4a5ec39f9ca6..0815690ac1e0 100644
--- a/trunk/drivers/s390/kvm/Makefile
+++ b/trunk/drivers/s390/kvm/Makefile
@@ -6,4 +6,4 @@
 # it under the terms of the GNU General Public License (version 2 only)
 # as published by the Free Software Foundation.
 
-obj-$(CONFIG_VIRTIO) += kvm_virtio.o
+obj-$(CONFIG_S390_GUEST) += kvm_virtio.o