diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-17 18:17:08 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-17 18:56:22 +0100 |
| commit | 6f991980a5e96f93a9f676959df2dcba665665ef (patch) | |
| tree | e6f46c0531e8a05b22be4c5adf7f7fb31afa6d13 /hw/ppc | |
| parent | a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0 (diff) | |
| parent | 1dd3a74d2ee2d873cde0b390b536e45420b3fe05 (diff) | |
| download | hqemu-6f991980a5e96f93a9f676959df2dcba665665ef.zip hqemu-6f991980a5e96f93a9f676959df2dcba665665ef.tar.gz | |
Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/ppc/e500.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 4492127..afdcc0e 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -10,7 +10,7 @@ obj-y += ppc_newworld.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o -obj-$(CONFIG_PSERIES) += spapr_pci.o pci-hotplug.o spapr_iommu.o +obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o spapr_iommu.o obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o # PowerPC 4xx boards obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index af6b671..8fab508 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -21,7 +21,7 @@ #include "net.h" #include "hw/hw.h" #include "hw/serial.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/boards.h" #include "sysemu.h" #include "kvm.h" |
