diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-23 10:58:02 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-23 10:58:02 -0600 |
| commit | c4ccbeaca521bdbf5cb8db37dc67c47e1add0586 (patch) | |
| tree | 110cb400e402af772a78495ce58d4715f617e0f4 /Makefile.objs | |
| parent | 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 (diff) | |
| parent | 506b7ddf889312659b36c667f7ae17bc9e909418 (diff) | |
| download | qemu-c4ccbeaca521bdbf5cb8db37dc67c47e1add0586.tar.gz qemu-c4ccbeaca521bdbf5cb8db37dc67c47e1add0586.tar.bz2 qemu-c4ccbeaca521bdbf5cb8db37dc67c47e1add0586.zip | |
Merge remote-tracking branch 'afaerber/prep-up' into staging
* afaerber/prep-up:
prep: Use i82378 PCI->ISA bridge for 'prep' machine
prep: Add i82378 PCI-to-ISA bridge emulation
prep: Add i82374 DMA emulation
MAINTAINERS: Add PCI host bridge files to PReP machine
prep: qdev'ify Raven host bridge (SysBus)
prep_pci: Update I/O to MemoryRegion ops
prep_pci: Simplify I/O endianness
prep: qdev'ify Raven host bridge (PCIDevice)
prep: Use ISA m48t59
prep: Fix offset of BIOS MemoryRegion
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index f94c881667..0b55f34bae 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -216,6 +216,7 @@ hw-obj-$(CONFIG_FDC) += fdc.o hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o hw-obj-$(CONFIG_DMA) += dma.o +hw-obj-$(CONFIG_I82374) += i82374.o hw-obj-$(CONFIG_HPET) += hpet.o hw-obj-$(CONFIG_APPLESMC) += applesmc.o hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o @@ -225,6 +226,7 @@ hw-obj-$(CONFIG_I8259) += i8259.o # PPC devices hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o +hw-obj-$(CONFIG_I82378) += i82378.o # Mac shared devices hw-obj-$(CONFIG_MACIO) += macio.o hw-obj-$(CONFIG_CUDA) += cuda.o |