From: Erez Zadok Date: Mon, 28 Jul 2008 06:17:00 +0000 (-0400) Subject: Unionfs: move fs/Makefile entry up to minimize merge conflicts X-Git-Tag: unionfs-2.4~18 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=468f45498e35257c58d0145a76e27fbb19bdbb74;p=unionfs-2.6.9.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 1234a436ace..21f4bc1d461 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/