@@ -27,3 +27,4 @@ CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
CONFIG_TPM_TIS=y
+CONFIG_PCI_HOTPLUG=y
@@ -42,3 +42,5 @@ CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_PSERIES=$(CONFIG_FDT)
CONFIG_E500=$(CONFIG_FDT)
+# For pSeries
+CONFIG_PCI_HOTPLUG=y
@@ -27,3 +27,4 @@ CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
CONFIG_TPM_TIS=y
+CONFIG_PCI_HOTPLUG=y
@@ -2,7 +2,7 @@ obj-y += mc146818rtc.o
obj-y += apic_common.o apic.o
obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o
obj-y += vmport.o
-obj-y += pci/pci-hotplug.o wdt_ib700.o
+obj-y += wdt_ib700.o
obj-y += debugcon.o debugexit.o
obj-y += pc_sysfw.o
obj-y += lpc_ich9.o q35.o
@@ -26,3 +26,4 @@ common-obj-$(CONFIG_PPCE500_PCI) += host-ppce500.o
# ARM devices
common-obj-$(CONFIG_VERSATILE_PCI) += host-versatile.o
+obj-$(CONFIG_PCI_HOTPLUG) += pci-hotplug.o
@@ -2,7 +2,7 @@
obj-y += mc146818rtc.o
# IBM pSeries (sPAPR)
obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_llan.o spapr_vscsi.o
-obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o
+obj-$(CONFIG_PSERIES) += spapr_pci.o
obj-$(CONFIG_PSERIES) += spapr_nvram.o
# PowerPC 4xx boards
obj-y += ppc4xx_pci.o
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- default-configs/i386-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 2 ++ default-configs/x86_64-softmmu.mak | 1 + hw/i386/Makefile.objs | 2 +- hw/pci/Makefile.objs | 1 + hw/ppc/Makefile.objs | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-)