summary refs log tree commit diff stats
path: root/include/hw/ppc/pnv.h
diff options
context:
space:
mode:
authorCédric Le Goater <clg@kaod.org>2016-11-07 19:03:02 +0100
committerDavid Gibson <david@gibson.dropbear.id.au>2016-11-15 10:05:51 +1100
commitec575aa0ae8caf1c7af66dad753d1d19a958a8c5 (patch)
treefd0ce25f00de8176d2bf6196ddc3cb97809ab4ae /include/hw/ppc/pnv.h
parent8bd9530e1302566e9dc71abe04346ca7d16613b1 (diff)
downloadfocaccia-qemu-ec575aa0ae8caf1c7af66dad753d1d19a958a8c5.tar.gz
focaccia-qemu-ec575aa0ae8caf1c7af66dad753d1d19a958a8c5.zip
ppc/pnv: fix compile breakage on old gcc
PnvChip is defined twice and this can confuse old compilers :

  CC      ppc64-softmmu/hw/ppc/pnv_xscom.o
In file included from qemu.git/hw/ppc/pnv.c:29:
qemu.git/include/hw/ppc/pnv.h:60: error: redefinition of typedef ‘PnvChip’
qemu.git/include/hw/ppc/pnv_xscom.h:24: note: previous declaration of ‘PnvChip’ was here
make[1]: *** [hw/ppc/pnv.o] Error 1
make[1]: *** Waiting for unfinished jobs....

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include/hw/ppc/pnv.h')
-rw-r--r--include/hw/ppc/pnv.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index 02ac1c5f42..7bee658733 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -21,7 +21,6 @@
 
 #include "hw/boards.h"
 #include "hw/sysbus.h"
-#include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/pnv_lpc.h"
 
 #define TYPE_PNV_CHIP "powernv-chip"