summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-18 20:46:45 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-18 20:46:45 -0700
commit66123549dbd75c67509c73b9d94bf7a9d2f4b286 (patch)
tree98588139d6cf56d524e5ce09d736f882f8e1bd4f /drivers
parent1a06a52ee1b0cdb65222474ba6186f3991df68b0 (diff)
parent29059d12e0c7f349aca6993acac20c5efbe13b81 (diff)
downloadlinux-66123549dbd75c67509c73b9d94bf7a9d2f4b286.tar.bz2
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/Kconfig4
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 @@
menu "Hardware crypto devices"
config CRYPTO_DEV_PADLOCK
- bool "Support for VIA PadLock ACE"
+ tristate "Support for VIA PadLock ACE"
depends on X86_32
select CRYPTO_ALGAPI
- default y
+ default m
help
Some VIA processors come with an integrated crypto engine
(so called VIA PadLock ACE, Advanced Cryptography Engine)