Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / hw / arm_pic.c

diff --git a/hw/arm_pic.c b/hw/arm_pic.c
index 7f4a694..f44568c 100644 (file)
--- a/hw/arm_pic.c
+++ b/hw/arm_pic.c
@@ -7,15 +7,16 @@
  * This code is licenced under the LGPL
  */
 
-#include "vl.h"
-#include "arm_pic.h"
+#include "hw.h"
+#include "pc.h"
+#include "arm-misc.h"
 
 /* Stub functions for hardware that doesn't exist.  */
-void pic_info(void)
+void pic_info(Monitor *mon)
 {
 }
 
-void irq_info(void)
+void irq_info(Monitor *mon)
 {
 }
 
@@ -38,7 +39,7 @@ static void arm_pic_cpu_handler(void *opaque, int irq, int level)
             cpu_reset_interrupt(env, CPU_INTERRUPT_FIQ);
         break;
     default:
-        cpu_abort(env, "arm_pic_cpu_handler: Bad interrput line %d\n", irq);
+        hw_error("arm_pic_cpu_handler: Bad interrput line %d\n", irq);
     }
 }