summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 22:50:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 22:50:35 -0700
commit91d44d99992ff2587104df5760bfffbb3564b3c2 (patch)
tree71316dfc11385f5594962f91d7192fdd851e86a8 /fs/squashfs/Makefile
parent2dad3206db5c3832cde1f58650027fea3ff7adf3 (diff)
parentcc6d3497141adedb71de8ddce62bf4cd4817832d (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: Squashfs: Make ZLIB compression support optional Squashfs: Update documentation for XZ and add squashfs-tools devel tree
Diffstat (limited to 'fs/squashfs/Makefile')
-rw-r--r--fs/squashfs/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
index cecf2bea07af..110b0476f3b4 100644
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -4,7 +4,8 @@
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-y += namei.o super.o symlink.o decompressor.o
squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o
squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o
squashfs-$(CONFIG_SQUASHFS_XZ) += xz_wrapper.o
+squashfs-$(CONFIG_SQUASHFS_ZLIB) += zlib_wrapper.o