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 | |
| parent | 3459f01b2d9612070ec23221a4ccb60a41b775ae (diff) | |
| parent | d2ad50210b35c2685640f7df931a0fccb49334f7 (diff) | |
| download | hqemu-95de21a430f7bc4166a153b1f69b1425c8a99c7b.zip hqemu-95de21a430f7bc4166a153b1f69b1425c8a99c7b.tar.gz | |
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')
| -rw-r--r-- | hw/arm/highbank.c | 1 | ||||
| -rw-r--r-- | hw/audio/marvell_88w8618.c | 1 | ||||
| -rw-r--r-- | hw/mips/mips_malta.c | 1 | ||||
| -rw-r--r-- | hw/misc/lm32_sys.c | 1 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_hcall.c | 1 | ||||
| -rw-r--r-- | hw/timer/exynos4210_rtc.c | 1 |
7 files changed, 0 insertions, 8 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 0fd9465..4405dbd 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -24,7 +24,6 @@ #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/sysbus.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index de06dfd..c5d88a7 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 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 9d521cc..5033d51 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -37,7 +37,6 @@ #include "sysemu/char.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" -#include "hw/boards.h" #include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h" diff --git a/hw/misc/lm32_sys.c b/hw/misc/lm32_sys.c index 33a3b80..aeaf2b7 100644 --- a/hw/misc/lm32_sys.c +++ b/hw/misc/lm32_sys.c @@ -34,7 +34,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" -#include "qemu/log.h" enum { R_CTRL = 0, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c96ac81..218ea23 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -43,8 +43,6 @@ #include "hw/ppc/xics.h" #include "hw/pci/msi.h" -#include "sysemu/kvm.h" -#include "kvm_ppc.h" #include "hw/pci/pci.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index f518aee..8f0b7e8 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1,6 +1,5 @@ #include "sysemu/sysemu.h" #include "cpu.h" -#include "sysemu/sysemu.h" #include "helper_regs.h" #include "hw/ppc/spapr.h" #include "mmu-hash64.h" diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index bceee44..3ac77f9 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -31,7 +31,6 @@ #include "hw/ptimer.h" #include "hw/hw.h" -#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/arm/exynos4210.h" |
