diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-21 12:26:55 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-21 12:26:55 +0800 |
commit | 229dc263feee52590e5b04c1bbcbd71f181447f0 (patch) | |
tree | ffa538c5aa65ccce27501f9636710ad6f14bc084 /crypto/crypto_user.c | |
parent | 3dc18ac906a12dd2a2f602193b80748e75586442 (diff) | |
parent | af900a7ee6a17784a9a343421ef0e3fe67f264fc (diff) | |
download | linux-crypto-229dc263feee52590e5b04c1bbcbd71f181447f0.tar.gz linux-crypto-229dc263feee52590e5b04c1bbcbd71f181447f0.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict in qat Makefile.
Diffstat (limited to '')
-rw-r--r-- | crypto/crypto_user.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c index c24a40c8..1c570548 100644 --- a/crypto/crypto_user.c +++ b/crypto/crypto_user.c @@ -440,6 +440,7 @@ static const int crypto_msg_min[CRYPTO_NR_MSGTYPES] = { [CRYPTO_MSG_NEWALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_DELALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_UPDATEALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), + [CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_DELRNG - CRYPTO_MSG_BASE] = 0, }; |