diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 14:43:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 14:43:22 -0500 |
| commit | e14e61e967f2b3bdf23f05e4ae5b9aa830151a44 (patch) | |
| tree | 9412c94cbe37bf6f0d0bd9ad2d8b907ce23eb1db /lib/Kconfig | |
| parent | cb10ea549fdc0ab2dd8988adab5bf40b4fa642f3 (diff) | |
| parent | 0ee4a96902dd7858e65f378c86f428a0355bd841 (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: (57 commits)
crypto: aes - Precompute tables
crypto: talitos - Ack done interrupt in isr instead of tasklet
crypto: testmgr - Correct comment about deflate parameters
crypto: salsa20 - Remove private wrappers around various operations
crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
crypto: sha512 - Switch to shash
crypto: sha512 - Move message schedule W[80] to static percpu area
crypto: michael_mic - Switch to shash
crypto: wp512 - Switch to shash
crypto: tgr192 - Switch to shash
crypto: sha256 - Switch to shash
crypto: md5 - Switch to shash
crypto: md4 - Switch to shash
crypto: sha1 - Switch to shash
crypto: rmd320 - Switch to shash
crypto: rmd256 - Switch to shash
crypto: rmd160 - Switch to shash
crypto: rmd128 - Switch to shash
crypto: null - Switch to shash
crypto: hash - Make setkey optional
...
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 85cf7ea978aa..fd4118e097f0 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -64,6 +64,8 @@ config CRC7 | |||
| 64 | 64 | ||
| 65 | config LIBCRC32C | 65 | config LIBCRC32C |
| 66 | tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check" | 66 | tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check" |
| 67 | select CRYPTO | ||
| 68 | select CRYPTO_CRC32C | ||
| 67 | help | 69 | help |
| 68 | This option is provided for the case where no in-kernel-tree | 70 | This option is provided for the case where no in-kernel-tree |
| 69 | modules require CRC32c functions, but a module built outside the | 71 | modules require CRC32c functions, but a module built outside the |