Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[mirror_qemu.git] / arch_init.c

diff --git a/arch_init.c b/arch_init.c
index 0a1531124c9577f786e04af287f9c0a6fbd37619..705d0b94ad012ccd7f6ff0f097bc97a3168af7ed 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -38,6 +38,10 @@
 int graphic_width = 1024;
 int graphic_height = 768;
 int graphic_depth = 8;
+#elif defined(TARGET_M68K)
+int graphic_width = 800;
+int graphic_height = 600;
+int graphic_depth = 8;
 #else
 int graphic_width = 800;
 int graphic_height = 600;