diff options
| -rw-r--r-- | Makefile.objs | 3 | ||||
| -rw-r--r-- | Makefile.target | 3 | ||||
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips64-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips64el-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mipsel-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 |
8 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.objs b/Makefile.objs index 110f8fd6c2..acbaf22745 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -153,7 +153,8 @@ hw-obj-$(CONFIG_I8254) += i8254.o hw-obj-$(CONFIG_PCSPK) += pcspk.o hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o hw-obj-$(CONFIG_FDC) += fdc.o -hw-obj-$(CONFIG_ACPI) += acpi.o +hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o +hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o # PPC devices hw-obj-$(CONFIG_OPENPIC) += openpic.o diff --git a/Makefile.target b/Makefile.target index f2cd4ffe98..a22484e1e9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -195,7 +195,7 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o 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 += debugcon.o multiboot.o -obj-i386-y += pm_smbus.o apm.o acpi_piix4.o pc_piix.o +obj-i386-y += pc_piix.o # shared objects obj-ppc-y = ppc.o @@ -221,7 +221,6 @@ obj-mips-y += dma.o vga.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 acpi_piix4.o obj-microblaze-y = petalogix_s3adsp1800_mmu.o diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 4c1495f08f..4fbd8aae2c 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -11,6 +11,7 @@ CONFIG_PCSPK=y CONFIG_USB_UHCI=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_APM=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 7793dbc924..fd6fbc1808 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -13,6 +13,7 @@ CONFIG_PCSPK=y CONFIG_USB_UHCI=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_APM=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index aa65d921ec..dfd30dbbea 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -13,6 +13,7 @@ CONFIG_PCSPK=y CONFIG_USB_UHCI=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_APM=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index b9b8c71b68..6fa54a3e15 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -13,6 +13,7 @@ CONFIG_PCSPK=y CONFIG_USB_UHCI=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_APM=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index e14831eefd..8203997b69 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -13,6 +13,7 @@ CONFIG_PCSPK=y CONFIG_USB_UHCI=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_APM=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 6662b9456b..ffedfdbd68 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -11,6 +11,7 @@ CONFIG_PCSPK=y CONFIG_USB_UHCI=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_APM=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y |