aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-05-12 23:04:18 +0000
committerLars-Peter Clausen <lars@metafoo.de>2010-05-12 23:04:18 +0000
commit37a8f3522fcfb961c94f102b4a5d9ad936d04de7 (patch)
tree448b3e3d1c338f726cd5656163c5e5c4b6c5ba32 /target/linux/generic-2.6
parent48ec7efd652948d823489d32f6dba147fe74c8ec (diff)
downloadupstream-37a8f3522fcfb961c94f102b4a5d9ad936d04de7.tar.gz
upstream-37a8f3522fcfb961c94f102b4a5d9ad936d04de7.tar.bz2
upstream-37a8f3522fcfb961c94f102b4a5d9ad936d04de7.zip
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
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/config-2.6.332
-rw-r--r--target/linux/generic-2.6/config-2.6.344
2 files changed, 5 insertions, 1 deletions
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