diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
| commit | e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5 (patch) | |
| tree | 37c20ec03e70dc7b5df1d02f16b6ac38d8ed1364 /fs/squashfs/decompressor.c | |
| parent | 7ac03db84baa204d7d280401ed65842541ed1078 (diff) | |
| parent | 56385a12d9bb9e173751f74b6c430742018cafc0 (diff) | |
| download | linux-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.tar.gz linux-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.tar.bz2 linux-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'fs/squashfs/decompressor.c')
| -rw-r--r-- | fs/squashfs/decompressor.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c index 157478da6ac9..24af9ce9722f 100644 --- a/fs/squashfs/decompressor.c +++ b/fs/squashfs/decompressor.c @@ -40,9 +40,11 @@ static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = { NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0 }; +#ifndef CONFIG_SQUASHFS_LZO static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = { NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0 }; +#endif static const struct squashfs_decompressor squashfs_unknown_comp_ops = { NULL, NULL, NULL, 0, "unknown", 0 @@ -51,7 +53,11 @@ static const struct squashfs_decompressor squashfs_unknown_comp_ops = { static const struct squashfs_decompressor *decompressor[] = { &squashfs_zlib_comp_ops, &squashfs_lzma_unsupported_comp_ops, +#ifdef CONFIG_SQUASHFS_LZO + &squashfs_lzo_comp_ops, +#else &squashfs_lzo_unsupported_comp_ops, +#endif &squashfs_unknown_comp_ops }; |