diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 17:21:26 +1000 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 17:21:26 +1000 |
commit | 9eb446c0764d660c26c118453a361c2a27db79cf (patch) | |
tree | 61358e44c8246625dc7fdb6c0ec97c5891f18ae6 /crypto/Kconfig | |
parent | cfc70c561cae81b50e4d9a2ad4ce5ce4d5688e5d (diff) | |
parent | bb5197831a43146cd4687853edbc0faec2bb9187 (diff) | |
download | linux-crypto-9eb446c0764d660c26c118453a361c2a27db79cf.tar.gz linux-crypto-9eb446c0764d660c26c118453a361c2a27db79cf.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to add prerequisite for ARM ux500 crypto support.
Diffstat (limited to '')
-rw-r--r-- | crypto/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 6318edd6..21ff9d01 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -308,6 +308,7 @@ comment "Digest" config CRYPTO_CRC32C tristate "CRC32c CRC algorithm" select CRYPTO_HASH + select CRC32 help Castagnoli, et al Cyclic Redundancy-Check Algorithm. Used by iSCSI for header and data digests and by others. |