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/Kconfig | |
parent | 2dad3206db5c3832cde1f58650027fea3ff7adf3 (diff) | |
parent | cc6d3497141adedb71de8ddce62bf4cd4817832d (diff) | |
download | kernel_samsung_smdk4412-91d44d99992ff2587104df5760bfffbb3564b3c2.zip kernel_samsung_smdk4412-91d44d99992ff2587104df5760bfffbb3564b3c2.tar.gz kernel_samsung_smdk4412-91d44d99992ff2587104df5760bfffbb3564b3c2.tar.bz2 |
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/Kconfig')
-rw-r--r-- | fs/squashfs/Kconfig | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig index 7797218..1360d4f 100644 --- a/fs/squashfs/Kconfig +++ b/fs/squashfs/Kconfig @@ -1,7 +1,6 @@ config SQUASHFS tristate "SquashFS 4.0 - Squashed file system support" depends on BLOCK - select ZLIB_INFLATE help Saying Y here includes support for SquashFS 4.0 (a Compressed Read-Only File System). Squashfs is a highly compressed read-only @@ -36,6 +35,19 @@ config SQUASHFS_XATTR If unsure, say N. +config SQUASHFS_ZLIB + bool "Include support for ZLIB compressed file systems" + depends on SQUASHFS + select ZLIB_INFLATE + default y + help + ZLIB compression is the standard compression used by Squashfs + file systems. It offers a good trade-off between compression + achieved and the amount of CPU time and memory necessary to + compress and decompress. + + If unsure, say Y. + config SQUASHFS_LZO bool "Include support for LZO compressed file systems" depends on SQUASHFS |