Merge commit '93d89f63e5a297f8672daf5d8b7b4df2a999af61' into upstream-merge

* commit '93d89f63e5a297f8672daf5d8b7b4df2a999af61':
  acpi: split acpi.c into the common part and the piix4 part.

Conflicts:
	Makefile.target
	hw/acpi.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/Makefile.target b/Makefile.target
index 1da5f5b5f..88a99fcb6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -211,7 +211,7 @@ obj-i386-y += vmmouse.o vmport.o hpet.o
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
 obj-i386-y += extboot.o
 obj-i386-y += debugcon.o multiboot.o
-obj-i386-y += pm_smbus.o apm.o
+obj-i386-y += pm_smbus.o apm.o acpi_piix4.o
 obj-i386-y += testdev.o
 
 obj-i386-$(CONFIG_KVM_PIT) += i8254-kvm.o
@@ -248,7 +248,7 @@ obj-mips-y += dma.o vga.o i8254.o i8259.o
 obj-mips-y += g364fb.o jazz_led.o
 obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o
 obj-mips-y += piix4.o cirrus_vga.o
-obj-mips-y += pm_smbus.o apm.o
+obj-mips-y += pm_smbus.o apm.o acpi_piix4.o
 
 obj-microblaze-y = petalogix_s3adsp1800_mmu.o