Merge branch 'eflags3' of git://github.com/rth7680/qemu

[qemu.git] / hw / shix.c

diff --git a/hw/shix.c b/hw/shix.c
index b56dd54f75b395483802fae792bd4e4c0f027cb4..6f2d55a155cd90bcaa347e7f78ac549785989afa 100644 (file)
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -29,10 +29,10 @@
 */
 #include "hw.h"
 #include "sh.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "loader.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define BIOS_FILENAME "shix_bios.bin"
 #define BIOS_ADDRESS 0xA0000000
@@ -92,6 +92,7 @@ static QEMUMachine shix_machine = {
     .desc = "shix card",
     .init = shix_init,
     .is_default = 1,
+    DEFAULT_MACHINE_OPTIONS,
 };
 
 static void shix_machine_init(void)