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 | 011e3c63251be832d23df9f0697626ab7b354d02 (patch) | |
| tree | 2cad5b58c274c93ae49d9b58fb15d784d4dfd78f /crypto | |
| parent | c1412fce7eccae62b4de22494f6ab3ff8a90c0c6 (diff) | |
| parent | ecca5c3acc0d0933d89abc44e60afb0cc8170e35 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 21ff9d015432..8e84225c096b 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -627,7 +627,7 @@ config CRYPTO_BLOWFISH_COMMON | |||
| 627 | 627 | ||
| 628 | config CRYPTO_BLOWFISH_X86_64 | 628 | config CRYPTO_BLOWFISH_X86_64 |
| 629 | tristate "Blowfish cipher algorithm (x86_64)" | 629 | tristate "Blowfish cipher algorithm (x86_64)" |
| 630 | depends on (X86 || UML_X86) && 64BIT | 630 | depends on X86 && 64BIT |
| 631 | select CRYPTO_ALGAPI | 631 | select CRYPTO_ALGAPI |
| 632 | select CRYPTO_BLOWFISH_COMMON | 632 | select CRYPTO_BLOWFISH_COMMON |
| 633 | help | 633 | help |
| @@ -657,7 +657,7 @@ config CRYPTO_CAMELLIA | |||
| 657 | 657 | ||
| 658 | config CRYPTO_CAMELLIA_X86_64 | 658 | config CRYPTO_CAMELLIA_X86_64 |
| 659 | tristate "Camellia cipher algorithm (x86_64)" | 659 | tristate "Camellia cipher algorithm (x86_64)" |
| 660 | depends on (X86 || UML_X86) && 64BIT | 660 | depends on X86 && 64BIT |
| 661 | depends on CRYPTO | 661 | depends on CRYPTO |
| 662 | select CRYPTO_ALGAPI | 662 | select CRYPTO_ALGAPI |
| 663 | select CRYPTO_LRW | 663 | select CRYPTO_LRW |
| @@ -893,7 +893,7 @@ config CRYPTO_TWOFISH_X86_64 | |||
| 893 | 893 | ||
| 894 | config CRYPTO_TWOFISH_X86_64_3WAY | 894 | config CRYPTO_TWOFISH_X86_64_3WAY |
| 895 | tristate "Twofish cipher algorithm (x86_64, 3-way parallel)" | 895 | tristate "Twofish cipher algorithm (x86_64, 3-way parallel)" |
| 896 | depends on (X86 || UML_X86) && 64BIT | 896 | depends on X86 && 64BIT |
| 897 | select CRYPTO_ALGAPI | 897 | select CRYPTO_ALGAPI |
| 898 | select CRYPTO_TWOFISH_COMMON | 898 | select CRYPTO_TWOFISH_COMMON |
| 899 | select CRYPTO_TWOFISH_X86_64 | 899 | select CRYPTO_TWOFISH_X86_64 |