summaryrefslogtreecommitdiffstats
path: root/lib/xz
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-02-21 16:44:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 17:22:26 -0800
commit5dc49c75a26b99e86a18441e0b64c1f7c7c6a500 (patch)
treec3c142d3c43785a753ab987a92961fa0fbf7e188 /lib/xz
parent64dbfb444c150f5b64979323a197dedc2ec3e02c (diff)
downloadlinux-stable-5dc49c75a26b99e86a18441e0b64c1f7c7c6a500.tar.gz
linux-stable-5dc49c75a26b99e86a18441e0b64c1f7c7c6a500.tar.bz2
linux-stable-5dc49c75a26b99e86a18441e0b64c1f7c7c6a500.zip
decompressors: make the default XZ_DEC_* config match the selected architecture
Change the defautl XZ_DEC_* config symbol to match the configured architecture. It is perfectly legitimate to support multiple XZ BCJ filters for different architectures (e.g.: to mount foreign squashfs/xz compressed filesystems), it is however more natural not to select them all by default, but only the one matching the configured architecture. Signed-off-by: Florian Fainelli <florian@openwrt.org> Acked-by: Lasse Collin <lasse.collin@tukaani.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/xz')
-rw-r--r--lib/xz/Kconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 8d464706d4eb..82a04d7ba99e 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -10,32 +10,32 @@ if XZ_DEC
config XZ_DEC_X86
bool "x86 BCJ filter decoder"
- default y
+ default y if X86
select XZ_DEC_BCJ
config XZ_DEC_POWERPC
bool "PowerPC BCJ filter decoder"
- default y
+ default y if POWERPC
select XZ_DEC_BCJ
config XZ_DEC_IA64
bool "IA-64 BCJ filter decoder"
- default y
+ default y if IA64
select XZ_DEC_BCJ
config XZ_DEC_ARM
bool "ARM BCJ filter decoder"
- default y
+ default y if ARM
select XZ_DEC_BCJ
config XZ_DEC_ARMTHUMB
bool "ARM-Thumb BCJ filter decoder"
- default y
+ default y if (ARM && ARM_THUMB)
select XZ_DEC_BCJ
config XZ_DEC_SPARC
bool "SPARC BCJ filter decoder"
- default y
+ default y if SPARC
select XZ_DEC_BCJ
endif