Merge commit 'kumar/next' into next

[mirror_ubuntu-artful-kernel.git] / fs / squashfs / Makefile

diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
index df8a19ef870d6db72cca324e4ef4667931b8dbd7..2cee3e9fa452b81219a04145f77c1ba827723a6e 100644 (file)
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -5,3 +5,5 @@
 obj-$(CONFIG_SQUASHFS) += squashfs.o
 squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
 squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
+squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o
+