diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-03-30 13:13:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-03-30 13:13:05 -0800 |
| commit | f5d6da7d1edd0d380a3bad4d88c1901050e18bf1 (patch) | |
| tree | 20910d121c9c2b58491f0179f6479dc2444c7562 /lib | |
| parent | b527eea4dc049bca0dd5d63de6555d8622965ba8 (diff) | |
| parent | e99122d248d5f22aa2466a53c29997386ac2865f (diff) | |
| download | history-f5d6da7d1edd0d380a3bad4d88c1901050e18bf1.tar.gz | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 918ab1dfec258e..1203bd92136c70 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -17,13 +17,14 @@ config CRC32 # config ZLIB_INFLATE tristate - default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y - default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m + 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 && (PPP_DEFLATE=m || JFFS2_FS=m) - default y if PPP_DEFLATE=y || JFFS2_FS=y + 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 |