Merge remote-tracking branch 'stefanha/block' into staging

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

diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 572b8684b0a5ffe14d4e85d6997a2de17c00f35a..51fe5bb3215016b32546413db3db8b1f4d35828b 100644 (file)
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1 +1,7 @@
 # Default configuration for m68k-softmmu
+
+include pci.mak
+include usb.mak
+CONFIG_COLDFIRE=y
+CONFIG_GDBSTUB_XML=y
+CONFIG_PTIMER=y