diff options
| author | Anthony Liguori | 2011-10-20 15:42:08 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-10-20 15:42:08 +0200 |
| commit | 1f99b94932fcf0a543e46e24875fc2b3a8c304a7 (patch) | |
| tree | deec2cb0dbebe1e6295b7068c85cdf181a378599 /Makefile.objs | |
| parent | runstate: Allow user to migrate twice (diff) | |
| parent | hw/9pfs: Handle Security model parsing (diff) | |
| download | qemu-1f99b94932fcf0a543e46e24875fc2b3a8c304a7.tar.gz qemu-1f99b94932fcf0a543e46e24875fc2b3a8c304a7.tar.xz qemu-1f99b94932fcf0a543e46e24875fc2b3a8c304a7.zip | |
Merge remote-tracking branch 'aneesh/for-upstream-6' into staging
Conflicts:
trace-events
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index 44d9bb9043..9e2077833e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -305,7 +305,7 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) -9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o virtio-9p-debug.o +9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o 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 |