diff --git a/[refs] b/[refs] index 2abd4bd678b7..5d46b120dc6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec87905930e44960cfb9f344e40d40427bb5075b +refs/heads/master: 510cf5a6d21e2fe03d63b5e6c95c60ceb7ea933c diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index b5ea38c25647..76e73158bcad 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -718,8 +718,8 @@ source "arch/s390/kvm/Kconfig" config S390_GUEST def_bool y - prompt "s390 support for virtio devices (EXPERIMENTAL)" - depends on 64BIT && EXPERIMENTAL + prompt "s390 support for virtio devices" + depends on 64BIT select VIRTUALIZATION select VIRTIO select VIRTIO_CONSOLE