diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 22:50:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 22:50:35 -0700 |
| commit | 91d44d99992ff2587104df5760bfffbb3564b3c2 (patch) | |
| tree | 71316dfc11385f5594962f91d7192fdd851e86a8 /fs/squashfs/decompressor.h | |
| parent | 2dad3206db5c3832cde1f58650027fea3ff7adf3 (diff) | |
| parent | cc6d3497141adedb71de8ddce62bf4cd4817832d (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/decompressor.h')
| -rw-r--r-- | fs/squashfs/decompressor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/squashfs/decompressor.h b/fs/squashfs/decompressor.h index 8ba70cff09a6..330073e29029 100644 --- a/fs/squashfs/decompressor.h +++ b/fs/squashfs/decompressor.h @@ -56,4 +56,8 @@ extern const struct squashfs_decompressor squashfs_xz_comp_ops; extern const struct squashfs_decompressor squashfs_lzo_comp_ops; #endif +#ifdef CONFIG_SQUASHFS_ZLIB +extern const struct squashfs_decompressor squashfs_zlib_comp_ops; +#endif + #endif |