From: Erez Zadok Date: Mon, 28 Jul 2008 04:25:46 +0000 (-0400) Subject: Unionfs: move fs/Makefile entry up to minimize merge conflicts X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=35ce23f6fcf4f749798647d854a0ecfe9e118c79;p=unionfs-2.6.27.y.git Unionfs: move fs/Makefile entry up to minimize merge conflicts Signed-off-by: Erez Zadok --- diff --git a/fs/Makefile b/fs/Makefile index 83b71392e9b..9bf391514c8 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/