diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 20:11:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 20:11:13 (GMT) |
| commit | 5520ebd308927a3beba599a2b68fa8c52f41f43b (patch) | |
| tree | b0395c15af7d096e6e6172a9d47bb7a8dec6add0 /fs/squashfs/Makefile | |
| parent | d3072e6a7e9bf7aca200370317f8e297be360b17 (diff) | |
| parent | 01a678c5a2f41663b8faf03d17e2bbdbf44158a9 (diff) | |
| download | linux-fsl-qoriq-5520ebd308927a3beba599a2b68fa8c52f41f43b.tar.xz | |
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: simplify CONFIG_SQUASHFS_LZO handling
Squashfs: move squashfs_i() definition from squashfs.h
Squashfs: get rid of default n in Kconfig
Squashfs: add missing check in zlib_wrapper
Squashfs: remove unnecessary variable in zlib_wrapper
Squashfs: Add XZ compression configuration option
Squashfs: add XZ compression support
Diffstat (limited to 'fs/squashfs/Makefile')
| -rw-r--r-- | fs/squashfs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile index 7672bac..cecf2be 100644 --- a/fs/squashfs/Makefile +++ b/fs/squashfs/Makefile @@ -7,3 +7,4 @@ 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_XATTR) += xattr.o xattr_id.o squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o +squashfs-$(CONFIG_SQUASHFS_XZ) += xz_wrapper.o |