diff options
| author | Cédric Le Goater | 2016-11-07 19:03:02 +0100 |
|---|---|---|
| committer | David Gibson | 2016-11-15 00:05:51 +0100 |
| commit | ec575aa0ae8caf1c7af66dad753d1d19a958a8c5 (patch) | |
| tree | fd0ce25f00de8176d2bf6196ddc3cb97809ab4ae /hw/ppc/pnv_lpc.c | |
| parent | powernv: CPU compatibility modes don't make sense for powernv (diff) | |
| download | qemu-ec575aa0ae8caf1c7af66dad753d1d19a958a8c5.tar.gz qemu-ec575aa0ae8caf1c7af66dad753d1d19a958a8c5.tar.xz 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 'hw/ppc/pnv_lpc.c')
| -rw-r--r-- | hw/ppc/pnv_lpc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index 00dbd8b07b..0e2117f0f5 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -23,8 +23,9 @@ #include "qapi/error.h" #include "qemu/log.h" -#include "hw/ppc/pnv_lpc.h" #include "hw/ppc/pnv.h" +#include "hw/ppc/pnv_lpc.h" +#include "hw/ppc/pnv_xscom.h" #include "hw/ppc/fdt.h" #include <libfdt.h> |