Unionfs: move fs/Makefile entry up to minimize merge conflicts

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/Makefile b/fs/Makefile
index a599900a4129e3a2872050370436670147360dd1..0569523625c7972a5ed6e12b3914ec71bebf6b43 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -69,6 +69,7 @@ obj-$(CONFIG_BFS_FS)          += bfs/
 obj-$(CONFIG_ISO9660_FS)       += isofs/
 obj-$(CONFIG_HFSPLUS_FS)       += hfsplus/ # Before hfs to find wrapped HFS+
 obj-$(CONFIG_HFS_FS)           += hfs/
+obj-$(CONFIG_UNION_FS)         += unionfs/
 obj-$(CONFIG_VXFS_FS)          += freevxfs/
 obj-$(CONFIG_NFS_FS)           += nfs/
 obj-$(CONFIG_EXPORTFS)         += exportfs/
@@ -103,4 +104,3 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
 obj-$(CONFIG_HPPFS)            += hppfs/
 obj-$(CONFIG_DEBUG_FS)         += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
-obj-$(CONFIG_UNION_FS)         += unionfs/