Merge remote-tracking branch 'luiz/queue/qmp' into staging

[qemu.git] / hw / lm32 / lm32_boards.c

diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index db9294809273175071057a63d78ae4aaccb14151..1ca94980fb7ef4d7f285b656e9dd110a36273330 100644 (file)
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -19,14 +19,14 @@
 
 #include "hw/sysbus.h"
 #include "hw/hw.h"
-#include "hw/flash.h"
+#include "hw/block/flash.h"
 #include "hw/devices.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "sysemu/blockdev.h"
 #include "elf.h"
-#include "hw/lm32_hwsetup.h"
-#include "hw/lm32.h"
+#include "lm32_hwsetup.h"
+#include "lm32.h"
 #include "exec/address-spaces.h"
 
 typedef struct {