diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:39:34 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:40:49 +0100 |
| commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
| tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /hw/mainstone.c | |
| parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
| parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/mainstone.c')
| -rw-r--r-- | hw/mainstone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/mainstone.c b/hw/mainstone.c index 5bbecb7304..a5ddbeff9d 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -14,13 +14,13 @@ #include "hw.h" #include "pxa.h" #include "arm-misc.h" -#include "net.h" +#include "net/net.h" #include "devices.h" #include "boards.h" #include "flash.h" -#include "blockdev.h" +#include "sysemu/blockdev.h" #include "sysbus.h" -#include "exec-memory.h" +#include "exec/address-spaces.h" /* Device addresses */ #define MST_FPGA_PHYS 0x08000000 |