diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 23:46:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 23:46:45 -0400 |
| commit | 66123549dbd75c67509c73b9d94bf7a9d2f4b286 (patch) | |
| tree | 98588139d6cf56d524e5ce09d736f882f8e1bd4f /drivers | |
| parent | 1a06a52ee1b0cdb65222474ba6186f3991df68b0 (diff) | |
| parent | 29059d12e0c7f349aca6993acac20c5efbe13b81 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index e678a33ea672..bb90cbd7ca51 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | menu "Hardware crypto devices" | 1 | menu "Hardware crypto devices" |
| 2 | 2 | ||
| 3 | config CRYPTO_DEV_PADLOCK | 3 | config CRYPTO_DEV_PADLOCK |
| 4 | bool "Support for VIA PadLock ACE" | 4 | tristate "Support for VIA PadLock ACE" |
| 5 | depends on X86_32 | 5 | depends on X86_32 |
| 6 | select CRYPTO_ALGAPI | 6 | select CRYPTO_ALGAPI |
| 7 | default y | 7 | default m |
| 8 | help | 8 | help |
| 9 | Some VIA processors come with an integrated crypto engine | 9 | Some VIA processors come with an integrated crypto engine |
| 10 | (so called VIA PadLock ACE, Advanced Cryptography Engine) | 10 | (so called VIA PadLock ACE, Advanced Cryptography Engine) |