commit 0d09e41a51aa0752b1ce525ce084f7cd210e461b
author Paolo Bonzini <pbonzini@redhat.com> Tue Feb 05 17:06:20 2013 +0100
committer Paolo Bonzini <pbonzini@redhat.com> Mon Apr 08 18:13:10 2013 +0200
tree dc92b5b32c1e3182afa9bfd16a46a0a089320102
parent bb585a784e9ad69207315d694e7dad2c422f6baa

hw: move headers to include/

Many of these should be cleaned up with proper qdev-/QOM-ification.
Right now there are many catch-all headers in include/hw/ARCH depending
on cpu.h, and this makes it necessary to compile these files per-target.
However, fixing this does not belong in these patches.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

hw/arm/nseries.c

diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index b28e7d3..ba8dc3e 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -20,14 +20,14 @@
 
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
-#include "hw/omap.h"
-#include "hw/arm-misc.h"
+#include "hw/arm/omap.h"
+#include "hw/arm.h"
 #include "hw/irq.h"
 #include "ui/console.h"
 #include "hw/boards.h"
-#include "hw/i2c.h"
-#include "hw/devices.h"
-#include "hw/flash.h"
+#include "hw/i2c/i2c.h"
+#include "hw/arm/devices.h"
+#include "hw/block/flash.h"
 #include "hw/hw.h"
 #include "hw/bt.h"
 #include "hw/loader.h"