Merge tag 'pull-maintainer-may24-160524-2' of https://gitlab.com/stsquad/qemu into...

[mirror_qemu.git] / default-configs / s390x-softmmu.mak

diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
deleted file mode 100644 (file)
index 9615a48..0000000
--- a/default-configs/s390x-softmmu.mak
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_PCI=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO=y
-CONFIG_SCLPCONSOLE=y
-CONFIG_TERMINAL3270=y
-CONFIG_S390_FLIC=y
-CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
-CONFIG_WDT_DIAG288=y