From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 8 Jun 2011 17:15:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'jvrao/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=93e0597ef9fa266756c30e61fafe4b70fc7ce6a6;p=qemu.git

Merge remote-tracking branch 'jvrao/for-anthony' into staging
---

93e0597ef9fa266756c30e61fafe4b70fc7ce6a6
diff --cc Makefile.target
index 85480d89c4,99ff3bae46..f7cb17de80
--- a/Makefile.target
+++ b/Makefile.target
@@@ -190,9 -191,10 +190,9 @@@ obj-y = arch_init.o cpus.o monitor.o ma
  # 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
+ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o
  obj-y += rwhandler.o
  obj-$(CONFIG_KVM) += kvm.o kvm-all.o
  obj-$(CONFIG_NO_KVM) += kvm-stub.o