diff options
| author | Blue Swirl | 2013-01-26 15:18:28 +0100 |
|---|---|---|
| committer | Blue Swirl | 2013-01-26 15:18:28 +0100 |
| commit | 13144781d4e9e6100b398213f9000576a3dc88f9 (patch) | |
| tree | 9931a5ec29fbc52c69d20c71db970b4c0cfd4a6d /hw/grackle_pci.c | |
| parent | tests: Add gcov support for x86_64 qtest (diff) | |
| parent | PPC: e500: Select MPIC v4.2 on ppce500 platform (diff) | |
| download | qemu-13144781d4e9e6100b398213f9000576a3dc88f9.tar.gz qemu-13144781d4e9e6100b398213f9000576a3dc88f9.tar.xz qemu-13144781d4e9e6100b398213f9000576a3dc88f9.zip | |
Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf:
PPC: e500: Select MPIC v4.2 on ppce500 platform
PPC: e500: fix mpic_iack address
openpic: add basic support for MPIC v4.2
openpic: fix timer address decoding
openpic: fix remaining issues from idr-to-destmask conversion
pseries: Adjust default VIO address allocations to play better with libvirt
pseries: Improve handling of multiple PCI host bridges
target-ppc: Give a meaningful error if too many threads are specified
cuda: Move ADB bus into CUDA state
adb: QOM'ify ADB devices
adb: QOM'ify Apple Desktop Bus
cuda: QOM'ify CUDA
ide/macio: QOM'ify MacIO IDE
mac_nvram: QOM'ify MacIO NVRAM
mac_nvram: Mark as Big Endian
mac_nvram: Clean up public API
macio: Split MacIO in two
macio: Delay qdev init until all fields are initialized
macio: QOM'ify some more
ppc: Move Mac machines to hw/ppc/
Diffstat (limited to 'hw/grackle_pci.c')
| -rw-r--r-- | hw/grackle_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 948416632a..95639d5735 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -24,7 +24,7 @@ */ #include "pci/pci_host.h" -#include "ppc_mac.h" +#include "ppc/mac.h" #include "pci/pci.h" /* debug Grackle */ |