aboutsummaryrefslogtreecommitdiff
path: root/hw/arm-misc.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-11-19 08:31:24 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-11-19 08:31:24 -0600
commitf44d771a8cfb3a22f9de76f8aae1832ee671ecd7 (patch)
treedd18fb2cf5f15507284e83980cf3d14c2c951129 /hw/arm-misc.h
parentd167dac993bc8223eb20b45e009bff22abd83354 (diff)
parent37507094f350b75c62dc059f998e7185de3ab60a (diff)
downloadqemu-arm-f44d771a8cfb3a22f9de76f8aae1832ee671ecd7.tar.gz
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu: target-i386: Add Haswell CPU model target-i386/cpu: Add new Opteron CPU model target-i386/cpu: Name new CPUID bits qapi-types.h: Don't include qemu-common.h osdep: Move qemu_{open,close}() prototypes qemu-config.h: Include headers it needs vnc-palette.h: Include <stdbool.h> qemu-fsdev-dummy.c: Include module.h qdev: Split up header so it can be used in cpu.h Move qemu_irq typedef out of qemu-common.h qemu-common.h: Comment about usage rules Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/arm-misc.h')
-rw-r--r--hw/arm-misc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index adb166586b..d129678b26 100644
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -12,6 +12,7 @@
#define ARM_MISC_H 1
#include "memory.h"
+#include "hw/irq.h"
/* The CPU is also modeled as an interrupt controller. */
#define ARM_PIC_CPU_IRQ 0