diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
| commit | 489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch) | |
| tree | 2c7ed6a0042dc15c91ece08c5a3866f610ddca6d /drivers/crypto | |
| parent | b322b7816908487c08b89b72f838174c37d8c836 (diff) | |
| parent | 82d27b2b2f3a80ffa7759a49b9cba39e47df476e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
trivial: remove the trivial patch monkey's name from SubmittingPatches
trivial: Fix a typo in comment of addrconf_dad_start()
trivial: usb: fix missing space typo in doc
trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
trivial: Remove the hyphen from git commands
trivial: fix ETIMEOUT -> ETIMEDOUT typos
trivial: Kconfig: .ko is normally not included in module names
trivial: SubmittingPatches: fix typo
trivial: Documentation/dell_rbu.txt: fix typos
trivial: Fix Pavel's address in MAINTAINERS
trivial: ftrace:fix description of trace directory
trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
trivial: input/misc: Fix typo in Kconfig
trivial: fix grammo in bus_for_each_dev() kerneldoc
trivial: rbtree.txt: fix rb_entry() parameters in sample code
trivial: spelling fix in ppc code comments
trivial: fix typo in bio_alloc kernel doc
trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
trivial: Miscellaneous documentation typo fixes
trivial: fix typo milisecond/millisecond for documentation and source comments.
...
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index e748e55bd86b..5b27692372bf 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
| @@ -34,7 +34,7 @@ config CRYPTO_DEV_PADLOCK_AES | |||
| 34 | Available in VIA C3 and newer CPUs. | 34 | Available in VIA C3 and newer CPUs. |
| 35 | 35 | ||
| 36 | If unsure say M. The compiled module will be | 36 | If unsure say M. The compiled module will be |
| 37 | called padlock-aes.ko | 37 | called padlock-aes. |
| 38 | 38 | ||
| 39 | config CRYPTO_DEV_PADLOCK_SHA | 39 | config CRYPTO_DEV_PADLOCK_SHA |
| 40 | tristate "PadLock driver for SHA1 and SHA256 algorithms" | 40 | tristate "PadLock driver for SHA1 and SHA256 algorithms" |
| @@ -47,7 +47,7 @@ config CRYPTO_DEV_PADLOCK_SHA | |||
| 47 | Available in VIA C7 and newer processors. | 47 | Available in VIA C7 and newer processors. |
| 48 | 48 | ||
| 49 | If unsure say M. The compiled module will be | 49 | If unsure say M. The compiled module will be |
| 50 | called padlock-sha.ko | 50 | called padlock-sha. |
| 51 | 51 | ||
| 52 | config CRYPTO_DEV_GEODE | 52 | config CRYPTO_DEV_GEODE |
| 53 | tristate "Support for the Geode LX AES engine" | 53 | tristate "Support for the Geode LX AES engine" |
| @@ -79,7 +79,7 @@ config ZCRYPT_MONOLITHIC | |||
| 79 | bool "Monolithic zcrypt module" | 79 | bool "Monolithic zcrypt module" |
| 80 | depends on ZCRYPT="m" | 80 | depends on ZCRYPT="m" |
| 81 | help | 81 | help |
| 82 | Select this option if you want to have a single module z90crypt.ko | 82 | Select this option if you want to have a single module z90crypt, |
| 83 | that contains all parts of the crypto device driver (ap bus, | 83 | that contains all parts of the crypto device driver (ap bus, |
| 84 | request router and all the card drivers). | 84 | request router and all the card drivers). |
| 85 | 85 | ||