diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:13:58 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:13:58 -0500 |
| commit | 13748cf499fbd93468e7103c0866e073a666f270 (patch) | |
| tree | b7bad9c923765b123703a738539bc66afb765a56 /Makefile.objs | |
| parent | 99cce9fa4e091fd7ead1926e1c0db016ef293f36 (diff) | |
| parent | 7665385a8580ee5cea2cae44e1b58d6d7518a156 (diff) | |
| download | qemu-13748cf499fbd93468e7103c0866e073a666f270.tar.gz qemu-13748cf499fbd93468e7103c0866e073a666f270.tar.bz2 qemu-13748cf499fbd93468e7103c0866e073a666f270.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index 66ffad4b78..50fbb200de 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -170,6 +170,7 @@ user-obj-y += cutils.o cache-utils.o hw-obj-y = hw-obj-y += vl.o loader.o hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o +hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o hw-obj-y += fw_cfg.o hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o hw-obj-$(CONFIG_PCI) += msix.o msi.o |