Merge remote-tracking branch 'sstabellini/xen-2013-04-05' into staging

[qemu.git] / hw / arm-misc.h

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index adb166586bab665ed2e90b2129b9df5a983d9bd5..7b2b02daaf252d2be7e93d4bce1fbd29cff2e4c6 100644 (file)
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -11,9 +11,10 @@
 #ifndef ARM_MISC_H
 #define ARM_MISC_H 1
 
-#include "memory.h"
+#include "exec/memory.h"
+#include "hw/irq.h"
 
-/* The CPU is also modeled as an interrupt controller.  */
+/* The CPU is also modelled as an interrupt controller.  */
 #define ARM_PIC_CPU_IRQ 0
 #define ARM_PIC_CPU_FIQ 1
 qemu_irq *arm_pic_init_cpu(ARMCPU *cpu);