aboutsummaryrefslogtreecommitdiff
path: root/Makefile.target
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-06-08 12:15:43 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-06-08 12:15:43 -0500
commit93e0597ef9fa266756c30e61fafe4b70fc7ce6a6 (patch)
treeb1dcd7925329853ac5284bc2c12ebecdfa44fa34 /Makefile.target
parentac779fe2334ebea5d4a365b053d786f7748a1db5 (diff)
parent5c3234c6c037943bd4c2d643a1b8cc35f563dbdb (diff)
Merge remote-tracking branch 'jvrao/for-anthony' into staging
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target
index 85480d89c4..f7cb17de80 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -192,7 +192,7 @@ obj-$(CONFIG_NO_PCI) += pci-stub.o
obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.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
@@ -411,8 +411,6 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
qmp-commands.h: $(SRC_PATH)/qmp-commands.hx
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
-9pfs/virtio-9p.o: CFLAGS += -I$(SRC_PATH)/hw/
-
clean:
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o