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.target | |
parent | 99cce9fa4e091fd7ead1926e1c0db016ef293f36 (diff) | |
parent | 7665385a8580ee5cea2cae44e1b58d6d7518a156 (diff) |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index 5c22df8b47..85480d89c4 100644 --- a/Makefile.target +++ b/Makefile.target @@ -190,7 +190,6 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o # need to fix this properly obj-$(CONFIG_NO_PCI) += pci-stub.o obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o -obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o |