Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-07-02' into staging

[qemu.git] / default-configs / mips-softmmu.mak

diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 9eeeea8bfd12848c94d2fd218d8d8350db14c873..9fede6e00f897bf94c677a33ab431d137e522a05 100644 (file)
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1,9 +1,3 @@
 # Default configuration for mips-softmmu
 
-CONFIG_ISA_MMIO=y
-CONFIG_ESP=y
-CONFIG_VGA_PCI=y
-CONFIG_VGA_ISA=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
+include mips-softmmu-common.mak