diff --git a/[refs] b/[refs] index 763a2b9948bb..db65283ea417 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec931035194709d0cde647d1c347bbf9634eec25 +refs/heads/master: a349365e5e0e0590cf68957abd2ead1e5249fdef diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig index 3d1a1e27944f..ec8369cff322 100644 --- a/trunk/crypto/Kconfig +++ b/trunk/crypto/Kconfig @@ -146,7 +146,6 @@ config CRYPTO_ECB tristate "ECB support" select CRYPTO_BLKCIPHER select CRYPTO_MANAGER - default m help ECB: Electronic CodeBook mode This is the simplest block cipher algorithm. It simply encrypts @@ -156,7 +155,6 @@ config CRYPTO_CBC tristate "CBC support" select CRYPTO_BLKCIPHER select CRYPTO_MANAGER - default m help CBC: Cipher Block Chaining mode This block cipher algorithm is required for IPSec. @@ -165,7 +163,6 @@ config CRYPTO_PCBC tristate "PCBC support" select CRYPTO_BLKCIPHER select CRYPTO_MANAGER - default m help PCBC: Propagating Cipher Block Chaining mode This block cipher algorithm is required for RxRPC.