aboutsummaryrefslogtreecommitdiffstats
path: root/fs/squashfs/decompressor.c
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2010-12-08 21:08:31 -0500
committerPhillip Lougher <phillip@lougher.demon.co.uk>2011-01-13 16:16:52 -0500
commit7a43ae523744c01b6187013e781f44c2281c579c (patch)
tree7f122fb883ef7cd86f08f90b770e03cae601efd3 /fs/squashfs/decompressor.c
parent81bb8debd0d570dc67dc1e9d8b612632cb941893 (diff)
Squashfs: Add XZ compression configuration option
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/decompressor.c')
-rw-r--r--fs/squashfs/decompressor.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c
index 24af9ce9722..482d7819781 100644
--- a/fs/squashfs/decompressor.c
+++ b/fs/squashfs/decompressor.c
@@ -46,6 +46,12 @@ static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
46}; 46};
47#endif 47#endif
48 48
49#ifndef CONFIG_SQUASHFS_XZ
50static const struct squashfs_decompressor squashfs_xz_comp_ops = {
51 NULL, NULL, NULL, XZ_COMPRESSION, "xz", 0
52};
53#endif
54
49static const struct squashfs_decompressor squashfs_unknown_comp_ops = { 55static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
50 NULL, NULL, NULL, 0, "unknown", 0 56 NULL, NULL, NULL, 0, "unknown", 0
51}; 57};
@@ -58,6 +64,7 @@ static const struct squashfs_decompressor *decompressor[] = {
58#else 64#else
59 &squashfs_lzo_unsupported_comp_ops, 65 &squashfs_lzo_unsupported_comp_ops,
60#endif 66#endif
67 &squashfs_xz_comp_ops,
61 &squashfs_unknown_comp_ops 68 &squashfs_unknown_comp_ops
62}; 69};
63 70