From f2e1015452d44c6573ff1f77c6bd058c412a56e3 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sun, 27 Jul 2008 22:59:17 -0400 Subject: [PATCH] Unionfs: move fs/Makefile entry up to minimize merge conflicts Signed-off-by: Erez Zadok --- fs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/Makefile b/fs/Makefile index 76c6accc462..0d6f050f0fe 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/ -- 2.43.0