From 37a8f3522fcfb961c94f102b4a5d9ad936d04de7 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 12 May 2010 23:04:18 +0000 Subject: [PATCH] Move CONFIG_LZMA_{DE,}COMPRESS to generic config It is selected by CONFIG_JFFS2_LZMA which is set in the generic config. SVN-Revision: 21437 --- target/linux/adm5120/router_be/config-2.6.33 | 2 -- target/linux/adm5120/router_be/config-2.6.34 | 2 -- target/linux/adm5120/router_le/config-2.6.33 | 2 -- target/linux/adm5120/router_le/config-2.6.34 | 2 -- target/linux/atheros/config-2.6.33 | 2 -- target/linux/atheros/config-2.6.34 | 2 -- target/linux/brcm47xx/config-2.6.33 | 2 -- target/linux/brcm47xx/config-2.6.34 | 2 -- target/linux/generic-2.6/config-2.6.33 | 2 ++ target/linux/generic-2.6/config-2.6.34 | 4 +++- target/linux/rb532/config-2.6.33 | 2 -- target/linux/rb532/config-2.6.34 | 2 -- 12 files changed, 5 insertions(+), 21 deletions(-) diff --git a/target/linux/adm5120/router_be/config-2.6.33 b/target/linux/adm5120/router_be/config-2.6.33 index 119001fe5c..f71fa97e0f 100644 --- a/target/linux/adm5120/router_be/config-2.6.33 +++ b/target/linux/adm5120/router_be/config-2.6.33 @@ -158,8 +158,6 @@ CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LOONGSON_UART_BASE=y -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/adm5120/router_be/config-2.6.34 b/target/linux/adm5120/router_be/config-2.6.34 index 85e9339ee0..5c3640c164 100644 --- a/target/linux/adm5120/router_be/config-2.6.34 +++ b/target/linux/adm5120/router_be/config-2.6.34 @@ -166,8 +166,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LOGFS is not set CONFIG_LOONGSON_UART_BASE=y # CONFIG_LPC_SCH is not set -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/adm5120/router_le/config-2.6.33 b/target/linux/adm5120/router_le/config-2.6.33 index 8ed5f19f13..d623beaac8 100644 --- a/target/linux/adm5120/router_le/config-2.6.33 +++ b/target/linux/adm5120/router_le/config-2.6.33 @@ -197,8 +197,6 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LOONGSON_UART_BASE=y -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/adm5120/router_le/config-2.6.34 b/target/linux/adm5120/router_le/config-2.6.34 index a4d6611328..db6390d73f 100644 --- a/target/linux/adm5120/router_le/config-2.6.34 +++ b/target/linux/adm5120/router_le/config-2.6.34 @@ -206,8 +206,6 @@ CONFIG_LIB80211_CRYPT_WEP=m # CONFIG_LOGFS is not set CONFIG_LOONGSON_UART_BASE=y # CONFIG_LPC_SCH is not set -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/atheros/config-2.6.33 b/target/linux/atheros/config-2.6.33 index 66a8b650d7..df0dcfb382 100644 --- a/target/linux/atheros/config-2.6.33 +++ b/target/linux/atheros/config-2.6.33 @@ -130,8 +130,6 @@ CONFIG_IP175C_PHY=y CONFIG_IRQ_CPU=y # CONFIG_LEDS_GPIO is not set CONFIG_LOONGSON_UART_BASE=y -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/atheros/config-2.6.34 b/target/linux/atheros/config-2.6.34 index 1a1a56c063..10d269525c 100644 --- a/target/linux/atheros/config-2.6.34 +++ b/target/linux/atheros/config-2.6.34 @@ -136,8 +136,6 @@ CONFIG_IRQ_CPU=y # CONFIG_LOGFS is not set CONFIG_LOONGSON_UART_BASE=y # CONFIG_LPC_SCH is not set -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/brcm47xx/config-2.6.33 b/target/linux/brcm47xx/config-2.6.33 index e284ccfa65..ad9a0e0610 100644 --- a/target/linux/brcm47xx/config-2.6.33 +++ b/target/linux/brcm47xx/config-2.6.33 @@ -132,8 +132,6 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y CONFIG_IRQ_CPU=y CONFIG_LEDS_GPIO=y CONFIG_LOONGSON_UART_BASE=y -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/brcm47xx/config-2.6.34 b/target/linux/brcm47xx/config-2.6.34 index 5a322145db..565f3e8f06 100644 --- a/target/linux/brcm47xx/config-2.6.34 +++ b/target/linux/brcm47xx/config-2.6.34 @@ -141,8 +141,6 @@ CONFIG_LEDS_GPIO=y # CONFIG_LOGFS is not set CONFIG_LOONGSON_UART_BASE=y # CONFIG_LPC_SCH is not set -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33 index 77e0060572..c5b127a5ac 100644 --- a/target/linux/generic-2.6/config-2.6.33 +++ b/target/linux/generic-2.6/config-2.6.33 @@ -1196,6 +1196,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_LSI_ET1011C_PHY is not set # CONFIG_LTPC is not set # CONFIG_LXT_PHY is not set +CONFIG_LZMA_COMPRESS=y +CONFIG_LZMA_DECOMPRESS=y CONFIG_MAC80211_DEFAULT_PS_VALUE=1 CONFIG_MAC80211_DEFAULT_PS=y # CONFIG_MAC80211 is not set diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34 index ae36574af5..9c68880336 100644 --- a/target/linux/generic-2.6/config-2.6.34 +++ b/target/linux/generic-2.6/config-2.6.34 @@ -1240,7 +1240,9 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_LSI_ET1011C_PHY is not set # CONFIG_LTPC is not set # CONFIG_LXT_PHY is not set -CONFIG_MAC80211_DEFAULT_PS_VALUE=1 +CONFIG_LZMA_COMPRESS=y +CONFIG_LZMA_DECOMPRESS=y +CCONFIG_MAC80211_DEFAULT_PS_VALUE=1 CONFIG_MAC80211_DEFAULT_PS=y # CONFIG_MAC80211 is not set # CONFIG_MAC_EMUMOUSEBTN is not set diff --git a/target/linux/rb532/config-2.6.33 b/target/linux/rb532/config-2.6.33 index 26544948ff..d15e20106d 100644 --- a/target/linux/rb532/config-2.6.33 +++ b/target/linux/rb532/config-2.6.33 @@ -134,8 +134,6 @@ CONFIG_KORINA=y # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_MIKROTIK_RB532=y CONFIG_LOONGSON_UART_BASE=y -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set diff --git a/target/linux/rb532/config-2.6.34 b/target/linux/rb532/config-2.6.34 index e52db5baf1..dea8e8ab4f 100644 --- a/target/linux/rb532/config-2.6.34 +++ b/target/linux/rb532/config-2.6.34 @@ -143,8 +143,6 @@ CONFIG_LEDS_MIKROTIK_RB532=y # CONFIG_LOGFS is not set CONFIG_LOONGSON_UART_BASE=y # CONFIG_LPC_SCH is not set -CONFIG_LZMA_COMPRESS=y -CONFIG_LZMA_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set -- 2.30.2