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 dbf5672d4863e2d6f3551017c2b45ee0544eb3ae..a1b3bdac89f9ebc604ca9f9ca9e9b2ce38500e7f 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -85,6 +85,7 @@ obj-$(CONFIG_ISO9660_FS)      += isofs/
 obj-$(CONFIG_HFSPLUS_FS)       += hfsplus/ # Before hfs to find wrapped HFS+
 obj-$(CONFIG_HFS_FS)           += hfs/
 obj-$(CONFIG_ECRYPT_FS)                += ecryptfs/
+obj-$(CONFIG_UNION_FS)         += unionfs/
 obj-$(CONFIG_VXFS_FS)          += freevxfs/
 obj-$(CONFIG_NFS_FS)           += nfs/
 obj-$(CONFIG_EXPORTFS)         += exportfs/
@@ -122,4 +123,3 @@ obj-$(CONFIG_DEBUG_FS)              += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
 obj-$(CONFIG_BTRFS_FS)         += btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
-obj-$(CONFIG_UNION_FS)         += unionfs/