GIT: unionfs2-2.6.27.y: Unionfs: move fs/Makefile entry up to minimize merge conflicts

[Erez Zadok]

commit b4bf006f9614651cd2ba8efa599534f823485f29
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Mon Jul 28 00:25:46 2008 -0400

    Unionfs: move fs/Makefile entry up to minimize merge conflicts
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

diff --git a/fs/Makefile b/fs/Makefile
index 83b7139..9bf3915 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -86,6 +86,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_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
-obj-$(CONFIG_UNION_FS)		+= unionfs/