hw/arm-misc.h -> include/hw/arm/arm.h
Change-Id: I1fa4d3ba51cd8ed077c78da1b22674c1361b7d4d
diff --git a/hw/android_arm.c b/hw/android_arm.c
index 896b412..8f0b43e 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -18,7 +18,7 @@
#include "goldfish_device.h"
#include "android/globals.h"
#include "audio/audio.h"
-#include "arm-misc.h"
+#include "hw/arm/arm.h"
#include "ui/console.h"
#include "sysemu/blockdev.h"
#include "goldfish_pipe.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 38c78df..c6e0199 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -8,7 +8,7 @@
*/
#include "hw/hw.h"
-#include "arm-misc.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#define KERNEL_ARGS_ADDR 0x100
diff --git a/hw/arm_pic.c b/hw/arm_pic.c
index 4e6b6ed..9ae4bca 100644
--- a/hw/arm_pic.c
+++ b/hw/arm_pic.c
@@ -9,7 +9,7 @@
#include "hw/hw.h"
#include "hw/i386/pc.h"
-#include "arm-misc.h"
+#include "hw/arm/arm.h"
/* Stub functions for hardware that doesn't exist. */
void pic_info(Monitor *mon)
diff --git a/hw/armv7m.c b/hw/armv7m.c
index ed4681c..c902078 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
-#include "arm-misc.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
/* Bitbanded IO. Each word corresponds to a single bit. */
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index cb45e4f..a298332 100644
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
-#include "arm-misc.h"
+#include "hw/arm/arm.h"
/* 32 internal lines (16 used for system exceptions) plus 64 external
interrupt lines. */
diff --git a/hw/arm-misc.h b/include/hw/arm/arm.h
similarity index 100%
rename from hw/arm-misc.h
rename to include/hw/arm/arm.h
