Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-misc-110720-2...

[mirror_qemu.git] / fsdev / Makefile.objs

diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs
index 24bbb3e75c907bf437efe0541e8583b329efecf6..42cd70c367fd1b4d002a98b7c87d707ed6448f8a 100644 (file)
--- a/fsdev/Makefile.objs
+++ b/fsdev/Makefile.objs
@@ -1,6 +1,6 @@
 # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
 # only pull in the actual 9p backend if we also enabled virtio or xen.
-ifeq ($(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO_9P),$(CONFIG_XEN))),y)
+ifeq ($(CONFIG_FSDEV_9P),y)
 common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
 else
 common-obj-y = qemu-fsdev-dummy.o