From 763915aaf09402b2cb39df766b2d4d5f34e53884 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Tue, 28 Oct 2008 11:10:22 +0100 Subject: [PATCH] --- yaml --- r: 117949 b: refs/heads/master c: ea4bfdf52a5a84492cce881baadc5fab36adeade h: refs/heads/master i: 117947: 91d88d3866f3d6d8e724a2c4cb9a7fd965ec6cc0 v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/kvm_virtio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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)