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

[~andy/linux] / fs / squashfs / Makefile

diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
index 70e3244fa30f6e67ec14df4f0a8d99ddd4d9719e..df8a19ef870d6db72cca324e4ef4667931b8dbd7 100644 (file)
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -4,4 +4,4 @@
 
 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
+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o