summaryrefslogtreecommitdiff
path: root/target/alix2d13
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-14 19:58:43 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-14 19:58:43 +0200
commit4cfceb141c0770aa37123fde6fc26c28283314ad (patch)
tree8973da1d99561d6ede8c4c69253d528a70e197f8 /target/alix2d13
parent3b76e79f14e279a6526809e630e45e4f760d77de (diff)
parentba4b6056da30ddb19809b72309a009a1c84a7656 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/alix2d13')
-rw-r--r--target/alix2d13/kernel.config13
1 files changed, 2 insertions, 11 deletions
diff --git a/target/alix2d13/kernel.config b/target/alix2d13/kernel.config
index fa700691b..f46102881 100644
--- a/target/alix2d13/kernel.config
+++ b/target/alix2d13/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34
-# Sat Jun 26 22:13:41 2010
+# Mon Jul 5 20:11:20 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1171,16 +1171,10 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_RNG2=y
# CONFIG_CRYPTO_MANAGER is not set
# CONFIG_CRYPTO_MANAGER2 is not set
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_WORKQUEUE=y
# CONFIG_CRYPTO_CRYPTD is not set
# CONFIG_CRYPTO_AUTHENC is not set
# CONFIG_CRYPTO_TEST is not set
@@ -1262,10 +1256,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
-CONFIG_CRYPTO_DEV_GEODE=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_HW is not set
#
# OCF Configuration