diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-12 19:41:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 19:41:23 -0400 |
| commit | b0b7944f432a1a669462e395ffd4491e4fed7367 (patch) | |
| tree | e06654f2a20ea2a6e49f89c074901a1b15cd3ac5 | |
| parent | 5088e34139308888db031d1e0b51ea806c81c171 (diff) | |
| parent | 30eb376a612bcb8c6e959fbd541556021d9be6b3 (diff) | |
| download | linux-crypto-b0b7944f432a1a669462e395ffd4491e4fed7367.tar.gz linux-crypto-b0b7944f432a1a669462e395ffd4491e4fed7367.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
| -rw-r--r-- | crypto/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 21ff9d01..8e84225c 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -627,7 +627,7 @@ config CRYPTO_BLOWFISH_COMMON config CRYPTO_BLOWFISH_X86_64 tristate "Blowfish cipher algorithm (x86_64)" - depends on (X86 || UML_X86) && 64BIT + depends on X86 && 64BIT select CRYPTO_ALGAPI select CRYPTO_BLOWFISH_COMMON help @@ -657,7 +657,7 @@ config CRYPTO_CAMELLIA config CRYPTO_CAMELLIA_X86_64 tristate "Camellia cipher algorithm (x86_64)" - depends on (X86 || UML_X86) && 64BIT + depends on X86 && 64BIT depends on CRYPTO select CRYPTO_ALGAPI select CRYPTO_LRW @@ -893,7 +893,7 @@ config CRYPTO_TWOFISH_X86_64 config CRYPTO_TWOFISH_X86_64_3WAY tristate "Twofish cipher algorithm (x86_64, 3-way parallel)" - depends on (X86 || UML_X86) && 64BIT + depends on X86 && 64BIT select CRYPTO_ALGAPI select CRYPTO_TWOFISH_COMMON select CRYPTO_TWOFISH_X86_64 |