From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erez Zadok Subject: [PATCH 2/2] Unionfs: move fs/Makefile entry up to minimize merge conflicts Date: Fri, 9 May 2008 16:07:16 -0400 Message-ID: <12103636371013-git-send-email-ezk@cs.sunysb.edu> References: <12103636363945-git-send-email-ezk@cs.sunysb.edu> Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, viro@ftp.linux.org.uk, hch@infradead.org, Erez Zadok To: akpm@linux-foundation.org Return-path: Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:37477 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753560AbYEIULG (ORCPT ); Fri, 9 May 2008 16:11:06 -0400 In-Reply-To: <12103636363945-git-send-email-ezk@cs.sunysb.edu> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Signed-off-by: Erez Zadok --- 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