Merge tag 'v2.6.0' into develop

[sdk/emulator/qemu.git] / hw / 9pfs / Makefile.objs

diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs
index da0ae0c..ac3e591 100644 (file)
--- a/hw/9pfs/Makefile.objs
+++ b/hw/9pfs/Makefile.objs
@@ -1,3 +1,23 @@
+<<<<<<< HEAD
+ifeq ($(CONFIG_MARU),y)
+common-obj-y  = virtio-9p-maru.o
+common-obj-y += virtio-9p-local-maru.o
+endif
+
+ifneq ($(CONFIG_MARU),y)
+common-obj-y  = virtio-9p.o
+common-obj-y += virtio-9p-local.o
+endif
+
+common-obj-y += virtio-9p-coth.o cofs.o codir.o cofile.o
+ifneq ($(CONFIG_WIN32),y)
+common-obj-y += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
+common-obj-y += virtio-9p-xattr.o coxattr.o
+endif
+common-obj-$(CONFIG_LINUX) += virtio-9p-synth.o
+common-obj-$(CONFIG_LINUX) += virtio-9p-proxy.o
+common-obj-$(CONFIG_OPEN_BY_HANDLE) +=  virtio-9p-handle.o
+=======
 common-obj-y  = 9p.o
 common-obj-y += 9p-local.o 9p-xattr.o
 common-obj-y += 9p-xattr-user.o 9p-posix-acl.o
@@ -5,5 +25,6 @@ common-obj-y += coth.o cofs.o codir.o cofile.o
 common-obj-y += coxattr.o 9p-synth.o
 common-obj-$(CONFIG_OPEN_BY_HANDLE) +=  9p-handle.o
 common-obj-y += 9p-proxy.o
+>>>>>>> v2.6.0
 
 obj-y += virtio-9p-device.o