Commit 66123549dbd75c67509c73b9d94bf7a9d2f4b286
Exists in
master
and in
7 other branches
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] tcrypt: Add missing error check [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again
Showing 2 changed files Side-by-side Diff
crypto/tcrypt.c
drivers/crypto/Kconfig
| 1 | 1 | menu "Hardware crypto devices" |
| 2 | 2 | |
| 3 | 3 | config CRYPTO_DEV_PADLOCK |
| 4 | - bool "Support for VIA PadLock ACE" | |
| 4 | + tristate "Support for VIA PadLock ACE" | |
| 5 | 5 | depends on X86_32 |
| 6 | 6 | select CRYPTO_ALGAPI |
| 7 | - default y | |
| 7 | + default m | |
| 8 | 8 | help |
| 9 | 9 | Some VIA processors come with an integrated crypto engine |
| 10 | 10 | (so called VIA PadLock ACE, Advanced Cryptography Engine) |