diff --git a/[refs] b/[refs]
index 233b747d9512..96b1b9cbd858 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f5a8ba6b0297ca941f43f8f5cbf0e5c8c4dd916
+refs/heads/master: ea4bfdf52a5a84492cce881baadc5fab36adeade
diff --git a/trunk/arch/s390/include/asm/kvm_virtio.h b/trunk/arch/s390/include/asm/kvm_virtio.h
index 146100224def..c13568b9351c 100644
--- a/trunk/arch/s390/include/asm/kvm_virtio.h
+++ b/trunk/arch/s390/include/asm/kvm_virtio.h
@@ -52,7 +52,7 @@ struct kvm_vqconfig {
 
 #ifdef __KERNEL__
 /* early virtio console setup */
-#ifdef CONFIG_VIRTIO_CONSOLE
+#ifdef CONFIG_S390_GUEST
 extern void s390_virtio_console_init(void);
 #else
 static inline void s390_virtio_console_init(void)