Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-01-16' into staging

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

diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 3e2ec3716c5222c2c6459a55d6d5de76ed43fb39..60f7cdfbf282d3869e8d4815337c0e12e2b777a9 100644 (file)
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1,5 +1,4 @@
 # Default configuration for m68k-softmmu
 
-include pci.mak
-CONFIG_GDBSTUB_XML=y
+CONFIG_COLDFIRE=y
 CONFIG_PTIMER=y