i386: move files referencing CPU to hw/i386/

[qemu.git] / hw / mcf5206.c

diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index 9bb393e3d4c27573fd7070dfd6ebfa81ab8b4961..58cd8d46c9a32597f39c2a36a50935712e4a2b91 100644 (file)
--- a/hw/mcf5206.c
+++ b/hw/mcf5206.c
@@ -5,10 +5,10 @@
  *
  * This code is licensed under the GPL
  */
-#include "hw.h"
-#include "mcf.h"
+#include "hw/hw.h"
+#include "hw/mcf.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
+#include "hw/ptimer.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 
@@ -226,7 +226,7 @@ static void m5206_mbar_update(m5206_mbar_state *s)
         level = 0;
         vector = 0;
     }
-    m68k_set_irq_level(&s->cpu->env, level, vector);
+    m68k_set_irq_level(s->cpu, level, vector);
 }
 
 static void m5206_mbar_set_irq(void *opaque, int irq, int level)