diff options
| -rw-r--r-- | crypto/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | fs/Kconfig | 4 | ||||
| -rw-r--r-- | fs/Kconfig.binfmt | 1 | ||||
| -rw-r--r-- | lib/Kconfig | 7 |
5 files changed, 10 insertions, 6 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 4257a428e336..5c90be225882 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -143,6 +143,8 @@ config CRYPTO_CAST6 config CRYPTO_DEFLATE tristate "Deflate compression algorithm" depends on CRYPTO + select ZLIB_INFLATE + select ZLIB_DEFLATE help This is the Deflate algorithm (RFC1951), specified for use in IPSec with the IPCOMP protocol (RFC3173, RFC2394). diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index a1b13141e085..19c6d8e7aceb 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2268,6 +2268,8 @@ config PPP_SYNC_TTY config PPP_DEFLATE tristate "PPP Deflate compression" depends on PPP + select ZLIB_INFLATE + select ZLIB_DEFLATE ---help--- Support for the Deflate compression method for PPP, which uses the Deflate algorithm (the same algorithm that gzip uses) to compress diff --git a/fs/Kconfig b/fs/Kconfig index 9efa0cd3cf44..b8292d75f276 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -496,6 +496,7 @@ config JOLIET config ZISOFS bool "Transparent decompression extension" depends on ISO9660_FS + select ZLIB_INFLATE help This is a Linux-specific extension to RockRidge which lets you store data in compressed form on a CD-ROM and have it transparently @@ -1047,6 +1048,8 @@ config JFFS2_FS tristate "Journalling Flash File System v2 (JFFS2) support" depends on MTD select CRC32 + select ZLIB_INFLATE + select ZLIB_DEFLATE help JFFS2 is the second generation of the Journalling Flash File System for use on diskless embedded devices. It provides improved wear @@ -1092,6 +1095,7 @@ config JFFS2_FS_NAND config CRAMFS tristate "Compressed ROM file system support" + select ZLIB_INFLATE help Saying Y here includes support for CramFs (Compressed ROM File System). CramFs is designed to be a simple, small, and compressed diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index d6d32c87b1c3..7e17bed7ae1e 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -36,6 +36,7 @@ config BINFMT_FLAT config BINFMT_ZFLAT bool "Enable ZFLAT support" depends on BINFMT_FLAT + select ZLIB_INFLATE help Support FLAT format compressed binaries diff --git a/lib/Kconfig b/lib/Kconfig index 1203bd92136c..e07caab6d649 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -13,18 +13,13 @@ config CRC32 require M here. # -# Do we need the compression support? +# compression support is select'ed if needed # config ZLIB_INFLATE tristate - default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y || CRYPTO_DEFLATE=y - default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m || CRYPTO_DEFLATE=m config ZLIB_DEFLATE tristate - default m if PPP_DEFLATE!=y && JFFS2_FS!=y && CRYPTO_DEFLATE!=y && \ - (PPP_DEFLATE=m || JFFS2_FS=m || CRYPTO_DEFLATE=m) - default y if PPP_DEFLATE=y || JFFS2_FS=y || CRYPTO_DEFLATE=y endmenu |