diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 02:18:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 02:18:44 +0200 |
| commit | ee792cd4fe5062c8c488e1b43ab877bba6e073d2 (patch) | |
| tree | c14446ed347bec18fac580f293e77af0c45eb80c /target/alix2d | |
| parent | 52ee190f6bbbf0bf0c3d354f0370c409aed14506 (diff) | |
| parent | da28ccc6f848695609d32090142f1b4af0e27b17 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/alix2d/kernel.config
Diffstat (limited to 'target/alix2d')
| -rw-r--r-- | target/alix2d/kernel.config | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config index 13b187f2a..9169d8037 100644 --- a/target/alix2d/kernel.config +++ b/target/alix2d/kernel.config @@ -1177,16 +1177,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 @@ -1268,10 +1262,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 |