diff options
author | Andreas Färber | 2012-12-23 00:39:34 +0100 |
---|---|---|
committer | Andreas Färber | 2012-12-23 00:40:49 +0100 |
commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /target-alpha/cpu-qom.h | |
parent | MAINTAINERS: Include X86CPU in CPU maintenance area (diff) | |
parent | target-xtensa: fix search_pc for the last TB opcode (diff) | |
download | qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.gz qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.xz qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.zip |
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-alpha/cpu-qom.h')
-rw-r--r-- | target-alpha/cpu-qom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h index 98585d5023..16367d2ea4 100644 --- a/target-alpha/cpu-qom.h +++ b/target-alpha/cpu-qom.h @@ -20,7 +20,7 @@ #ifndef QEMU_ALPHA_CPU_QOM_H #define QEMU_ALPHA_CPU_QOM_H -#include "qemu/cpu.h" +#include "qom/cpu.h" #include "cpu.h" #define TYPE_ALPHA_CPU "alpha-cpu" |