commit 468f45498e35257c58d0145a76e27fbb19bdbb74
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Mon Jul 28 02:17:00 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 1234a43..21f4bc1 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -63,6 +63,7 @@ obj-$(CONFIG_ISO9660_FS) += isofs/
obj-$(CONFIG_DEVFS_FS) += devfs/
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/
@@ -93,4 +94,3 @@ obj-$(CONFIG_AFS_FS) += afs/
obj-$(CONFIG_BEFS_FS) += befs/
obj-$(CONFIG_HOSTFS) += hostfs/
obj-$(CONFIG_HPPFS) += hppfs/
-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
