summaryrefslogtreecommitdiffstats
path: root/fs/ext2/Makefile
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-02 14:39:09 +0200
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-02 14:39:09 +0200
commitd2f6409584e2c62ffad81690562330ff3bf4a458 (patch)
tree3bdfb97d0b51be2f7f414f2107e97603c1206abb /fs/ext2/Makefile
parentAUDIT: Use KERN_NOTICE for printk of audit records (diff)
parent[PATCH] alpha smp fix (part #2) (diff)
downloadlinux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.xz
linux-d2f6409584e2c62ffad81690562330ff3bf4a458.zip
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/ext2/Makefile')
-rw-r--r--fs/ext2/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext2/Makefile b/fs/ext2/Makefile
index ee240a14e70f..c5d02da73bc3 100644
--- a/fs/ext2/Makefile
+++ b/fs/ext2/Makefile
@@ -10,3 +10,4 @@ ext2-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
ext2-$(CONFIG_EXT2_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
ext2-$(CONFIG_EXT2_FS_POSIX_ACL) += acl.o
ext2-$(CONFIG_EXT2_FS_SECURITY) += xattr_security.o
+ext2-$(CONFIG_EXT2_FS_XIP) += xip.o