diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2014-06-04 19:11:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:18 -0400 |
commit | bf4d064d89aebe3cc43d875c0803478a6a1dde12 (patch) | |
tree | a68980b806a93f96e031b97eb76a2624b56e82c2 /lib | |
parent | 1812062790ab647e85821f21f2263f56eaeffc11 (diff) |
lib/xz: enable all filters by default in Kconfig
This restores the old behavior that existed before 2013-02-22, when
changes were made by 64dbfb444c150 ("decompressors: drop dependency on
CONFIG_EXPERT") and 5dc49c75a2 ("decompressors: make the default
XZ_DEC_* config match the selected architecture").
Disabling the filters only makes sense on embedded systems.
Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Acked-by: Kyle McMartin <kyle@infradead.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/xz/Kconfig | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig index 08837db52d94..12d2d777f36b 100644 --- a/lib/xz/Kconfig +++ b/lib/xz/Kconfig | |||
@@ -9,33 +9,33 @@ config XZ_DEC | |||
9 | if XZ_DEC | 9 | if XZ_DEC |
10 | 10 | ||
11 | config XZ_DEC_X86 | 11 | config XZ_DEC_X86 |
12 | bool "x86 BCJ filter decoder" | 12 | bool "x86 BCJ filter decoder" if EXPERT |
13 | default y if X86 | 13 | default y |
14 | select XZ_DEC_BCJ | 14 | select XZ_DEC_BCJ |
15 | 15 | ||
16 | config XZ_DEC_POWERPC | 16 | config XZ_DEC_POWERPC |
17 | bool "PowerPC BCJ filter decoder" | 17 | bool "PowerPC BCJ filter decoder" if EXPERT |
18 | default y if PPC | 18 | default y |
19 | select XZ_DEC_BCJ | 19 | select XZ_DEC_BCJ |
20 | 20 | ||
21 | config XZ_DEC_IA64 | 21 | config XZ_DEC_IA64 |
22 | bool "IA-64 BCJ filter decoder" | 22 | bool "IA-64 BCJ filter decoder" if EXPERT |
23 | default y if IA64 | 23 | default y |
24 | select XZ_DEC_BCJ | 24 | select XZ_DEC_BCJ |
25 | 25 | ||
26 | config XZ_DEC_ARM | 26 | config XZ_DEC_ARM |
27 | bool "ARM BCJ filter decoder" | 27 | bool "ARM BCJ filter decoder" if EXPERT |
28 | default y if ARM | 28 | default y |
29 | select XZ_DEC_BCJ | 29 | select XZ_DEC_BCJ |
30 | 30 | ||
31 | config XZ_DEC_ARMTHUMB | 31 | config XZ_DEC_ARMTHUMB |
32 | bool "ARM-Thumb BCJ filter decoder" | 32 | bool "ARM-Thumb BCJ filter decoder" if EXPERT |
33 | default y if (ARM && ARM_THUMB) | 33 | default y |
34 | select XZ_DEC_BCJ | 34 | select XZ_DEC_BCJ |
35 | 35 | ||
36 | config XZ_DEC_SPARC | 36 | config XZ_DEC_SPARC |
37 | bool "SPARC BCJ filter decoder" | 37 | bool "SPARC BCJ filter decoder" if EXPERT |
38 | default y if SPARC | 38 | default y |
39 | select XZ_DEC_BCJ | 39 | select XZ_DEC_BCJ |
40 | 40 | ||
41 | endif | 41 | endif |