summaryrefslogtreecommitdiff
path: root/target-alpha/cpu.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-12-23 00:39:34 +0100
committerAndreas Färber <afaerber@suse.de>2012-12-23 00:40:49 +0100
commit501a7ce7270955be151c442c27620fa7af2f3ce5 (patch)
tree0374e4d581a0246074d55712b81baf01f3c439b6 /target-alpha/cpu.c
parent62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff)
parent36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff)
downloadqemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.gz
qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.bz2
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.c')
-rw-r--r--target-alpha/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index 59d8669ab0..212a6250ba 100644
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "qemu-common.h"
-#include "error.h"
+#include "qapi/error.h"
static void alpha_cpu_realize(Object *obj, Error **errp)