diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
| commit | 95de21a430f7bc4166a153b1f69b1425c8a99c7b (patch) | |
| tree | ed0754df09c7e0bd9bafce52cffdd8257a687897 /hw/audio/marvell_88w8618.c | |
| parent | 3459f01b2d9612070ec23221a4ccb60a41b775ae (diff) | |
| parent | d2ad50210b35c2685640f7df931a0fccb49334f7 (diff) | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Christophe Lyon (1) and others
# Via Michael Tokarev
* mjt/trivial-patches:
target-moxie: replace target_phys_addr_t with hwaddr
Rename hexdump to avoid FreeBSD libutil conflict
remove some double-includes
translate: remove redundantly included qemu/timer.h
Remove twice include of qemu-common.h
fix /proc/self/maps output
Message-id: 51977B44.1000302@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/audio/marvell_88w8618.c')
| -rw-r--r-- | hw/audio/marvell_88w8618.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index de06dfd7d2..c5d88a7841 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -12,7 +12,6 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" -#include "hw/sysbus.h" #include "audio/audio.h" #define MP_AUDIO_SIZE 0x00001000 |