Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-omap-h63xx.git] / fs / jffs2 / Makefile

diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index 77dc5561a04e7def0490e1fa3af3634945726bf0..c32b241e3d91790dab5cfa7941f9d51a562ca357 100644 (file)
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -1,7 +1,6 @@
 #
 # Makefile for the Linux Journalling Flash File System v2 (JFFS2)
 #
-# $Id: Makefile.common,v 1.11 2005/09/07 08:34:53 havasi Exp $
 #
 
 obj-$(CONFIG_JFFS2_FS) += jffs2.o
@@ -12,6 +11,9 @@ jffs2-y       += symlink.o build.o erase.o background.o fs.o writev.o
 jffs2-y        += super.o debug.o
 
 jffs2-$(CONFIG_JFFS2_FS_WRITEBUFFER)   += wbuf.o
+jffs2-$(CONFIG_JFFS2_FS_XATTR)         += xattr.o xattr_trusted.o xattr_user.o
+jffs2-$(CONFIG_JFFS2_FS_SECURITY)      += security.o
+jffs2-$(CONFIG_JFFS2_FS_POSIX_ACL)     += acl.o
 jffs2-$(CONFIG_JFFS2_RUBIN)    += compr_rubin.o
 jffs2-$(CONFIG_JFFS2_RTIME)    += compr_rtime.o
 jffs2-$(CONFIG_JFFS2_ZLIB)     += compr_zlib.o