commit f2e1015452d44c6573ff1f77c6bd058c412a56e3
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Sun Jul 27 22:59:17 2008 -0400
Unionfs: move fs/Makefile entry up to minimize merge conflicts
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/Makefile b/fs/Makefile
index 76c6acc..0d6f050 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -80,6 +80,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/
@@ -115,4 +116,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/
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
