aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/config-3.3
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-03 14:10:27 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-03 14:10:27 +0000
commitd8d782c5d7f51f022b10ee560b6c105492344b8f (patch)
treef552ce467af8ae2466f8f6378fbdac232b2ffc75 /target/linux/generic/config-3.3
parent0d81aed761563a503c03ec1e5cd85f7ef751c51a (diff)
downloadupstream-d8d782c5d7f51f022b10ee560b6c105492344b8f.tar.gz
upstream-d8d782c5d7f51f022b10ee560b6c105492344b8f.tar.bz2
upstream-d8d782c5d7f51f022b10ee560b6c105492344b8f.zip
linux/3.3: merge recent ubifs patches from 3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30800 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/config-3.3')
-rw-r--r--target/linux/generic/config-3.31
1 files changed, 1 insertions, 0 deletions
diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index f53668dc45..967b89803a 100644
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -491,6 +491,7 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
# CONFIG_CRYPTO_VMAC is not set
# CONFIG_CRYPTO_WP512 is not set
# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XZ is not set
# CONFIG_CRYPTO_XTS is not set
# CONFIG_CRYPTO_ZLIB is not set
# CONFIG_CRYSTALHD is not set