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

[qemu.git] / hw / imx_timer.c

diff --git a/hw/imx_timer.c b/hw/imx_timer.c
index e924c747c542b4cc8cef0b82175b155b3ed5e003..a8c311141e9caa1459786ab4a654aeaa32766672 100644 (file)
--- a/hw/imx_timer.c
+++ b/hw/imx_timer.c
@@ -11,11 +11,11 @@
  *
  */
 
-#include "hw.h"
+#include "hw/hw.h"
 #include "qemu/timer.h"
-#include "ptimer.h"
-#include "sysbus.h"
-#include "imx.h"
+#include "hw/ptimer.h"
+#include "hw/sysbus.h"
+#include "hw/imx.h"
 
 //#define DEBUG_TIMER 1
 #ifdef DEBUG_TIMER