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 /audio/audio.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 'audio/audio.c')
| -rw-r--r-- | audio/audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/audio.c b/audio/audio.c index 1c7738930b..1510b598a6 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -23,9 +23,9 @@ */ #include "hw/hw.h" #include "audio.h" -#include "monitor.h" -#include "qemu-timer.h" -#include "sysemu.h" +#include "monitor/monitor.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" #define AUDIO_CAP "audio" #include "audio_int.h" |