diff options
| author | Andreas Färber | 2013-01-10 21:52:28 +0100 |
|---|---|---|
| committer | Andreas Färber | 2013-01-10 21:52:28 +0100 |
| commit | 63e3555e80c31776285accbb4d0c14ae91c457dc (patch) | |
| tree | 89907c82724d6519c8bbad7acc15c0198c6f902f /tests/check-qint.c | |
| parent | prep: Use pc87312 device instead of collection of random ISA devices (diff) | |
| parent | Merge remote-tracking branch 'kraxel/build.1' into staging (diff) | |
| download | qemu-63e3555e80c31776285accbb4d0c14ae91c457dc.tar.gz qemu-63e3555e80c31776285accbb4d0c14ae91c457dc.tar.xz qemu-63e3555e80c31776285accbb4d0c14ae91c457dc.zip | |
Merge branch 'master' of git://git.qemu.org/qemu into prep-up
Conflicts:
hw/Makefile.objs
hw/ppc_prep.c
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Diffstat (limited to 'tests/check-qint.c')
| -rw-r--r-- | tests/check-qint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/check-qint.c b/tests/check-qint.c index 5a27119ae2..86868844ab 100644 --- a/tests/check-qint.c +++ b/tests/check-qint.c @@ -11,7 +11,7 @@ */ #include <glib.h> -#include "qint.h" +#include "qapi/qmp/qint.h" #include "qemu-common.h" /* |