login
Header Space

 
 

[PATCH 2/2] Unionfs: move fs/Makefile entry up to minimize merge conflicts

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <akpm@...>
Cc: <linux-kernel@...>, <linux-fsdevel@...>, <viro@...>, <hch@...>, Erez Zadok <ezk@...>
Date: Friday, May 9, 2008 - 4:07 pm

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---
 fs/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/Makefile b/fs/Makefile
index 22ebb61..dadf53b 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -85,6 +85,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/
@@ -119,4 +120,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/
-- 
1.5.2.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[GIT PULL -mm] 0/2 Unionfs updates/fixes/cleanups, Erez Zadok, (Fri May 9, 4:07 pm)
[PATCH 2/2] Unionfs: move fs/Makefile entry up to minimize m..., Erez Zadok, (Fri May 9, 4:07 pm)
[PATCH 1/2] Unionfs: use new umount_begin prototype, Erez Zadok, (Fri May 9, 4:07 pm)
speck-geostationary