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 /target-s390x/translate.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 'target-s390x/translate.c')
| -rw-r--r-- | target-s390x/translate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 787e3c6963..9e34741311 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -30,14 +30,14 @@ #endif #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg-op.h" -#include "qemu-log.h" +#include "qemu/log.h" /* global register indexes */ static TCGv_ptr cpu_env; -#include "gen-icount.h" +#include "exec/gen-icount.h" #include "helper.h" #define GEN_HELPER 1 #include "helper.h" |