diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:06:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:06:02 -0500 |
| commit | d439b79d730bf219e47c14ab94f1546bcc5045ab (patch) | |
| tree | c8d0ae00ff1e86e7ecdaac028d2b2db30305f0c3 /Makefile.objs | |
| parent | 96b3d73f5ad5838690d42666c566a48be9d173dc (diff) | |
| parent | 2583e443676e6b9259425f7d5ccaccbfa9bf7886 (diff) | |
| download | qemu-d439b79d730bf219e47c14ab94f1546bcc5045ab.tar.gz qemu-d439b79d730bf219e47c14ab94f1546bcc5045ab.tar.bz2 qemu-d439b79d730bf219e47c14ab94f1546bcc5045ab.zip | |
Merge remote-tracking branch 'aneesh/for-upstream-7' 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 a19e7c5f57..31c8cc7b03 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -310,6 +310,7 @@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-coth.o cofs.o codir.o cofile.o 9pfs-nested-$(CONFIG_VIRTFS) += coxattr.o virtio-9p-handle.o +9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-synth.o hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y)) $(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=$(GLIB_CFLAGS) |