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/ppc/e500.c | |
parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
download | hqemu-501a7ce7270955be151c442c27620fa7af2f3ce5.zip hqemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.gz |
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/ppc/e500.c')
-rw-r--r-- | hw/ppc/e500.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 5592359..b262f31 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -18,22 +18,23 @@ #include "qemu-common.h" #include "e500.h" #include "e500-ccsr.h" -#include "net.h" +#include "net/net.h" +#include "qemu/config-file.h" #include "hw/hw.h" #include "hw/serial.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/boards.h" -#include "sysemu.h" -#include "kvm.h" +#include "sysemu/sysemu.h" +#include "sysemu/kvm.h" #include "kvm_ppc.h" -#include "device_tree.h" +#include "sysemu/device_tree.h" #include "hw/openpic.h" #include "hw/ppc.h" #include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" -#include "exec-memory.h" -#include "host-utils.h" +#include "exec/address-spaces.h" +#include "qemu/host-utils.h" #include "hw/ppce500_pci.h" #define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb" |