Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[pandora-kernel.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 17775cf..b220e15 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -116,7 +116,6 @@ config S390
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       select HAVE_IRQ_WORK
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZMA
@@ -719,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