diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 11:54:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 11:54:25 -0700 |
| commit | 0e496b8e84410c96d1ffc86f0b37b0328a4234da (patch) | |
| tree | d8a2aeeaee03eb4f305ba4dc5ab9395c4ee31321 /crypto/Kconfig | |
| parent | pcmcia: pd6729: fix error return code in pd6729_pci_probe() (diff) | |
| parent | Linux 3.10-rc6 (diff) | |
| download | linux-dev-0e496b8e84410c96d1ffc86f0b37b0328a4234da.tar.xz linux-dev-0e496b8e84410c96d1ffc86f0b37b0328a4234da.zip | |
Merge 3.10-rc6 into char-misc-next
We want the fixes in here.
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 622d8a48cbe9..bf8148e74e73 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -823,6 +823,7 @@ config CRYPTO_BLOWFISH_X86_64 config CRYPTO_BLOWFISH_AVX2_X86_64 tristate "Blowfish cipher algorithm (x86_64/AVX2)" depends on X86 && 64BIT + depends on BROKEN select CRYPTO_ALGAPI select CRYPTO_CRYPTD select CRYPTO_ABLK_HELPER_X86 @@ -1299,6 +1300,7 @@ config CRYPTO_TWOFISH_AVX_X86_64 config CRYPTO_TWOFISH_AVX2_X86_64 tristate "Twofish cipher algorithm (x86_64/AVX2)" depends on X86 && 64BIT + depends on BROKEN select CRYPTO_ALGAPI select CRYPTO_CRYPTD select CRYPTO_ABLK_HELPER_X86 |