aboutsummaryrefslogtreecommitdiff
path: root/include/hw/i386/pc.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-05-22 08:22:36 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-22 08:22:36 -0500
commit95de21a430f7bc4166a153b1f69b1425c8a99c7b (patch)
treeed0754df09c7e0bd9bafce52cffdd8257a687897 /include/hw/i386/pc.h
parent3459f01b2d9612070ec23221a4ccb60a41b775ae (diff)
parentd2ad50210b35c2685640f7df931a0fccb49334f7 (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 'include/hw/i386/pc.h')
-rw-r--r--include/hw/i386/pc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 93d8357cec..663426cee8 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -7,7 +7,6 @@
#include "hw/isa/isa.h"
#include "hw/block/fdc.h"
#include "net/net.h"
-#include "exec/memory.h"
#include "hw/i386/ioapic.h"
/* PC-style peripherals (also used by other machines). */