From: Andrew Morton <akpm@linux-foundation.org>

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/s390/crypto/sha1_s390.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -puN arch/s390/crypto/sha1_s390.c~git-cryptodev-fix-conflict arch/s390/crypto/sha1_s390.c
--- a/arch/s390/crypto/sha1_s390.c~git-cryptodev-fix-conflict
+++ a/arch/s390/crypto/sha1_s390.c
@@ -50,14 +50,14 @@ static struct crypto_alg alg = {
 	.cra_priority	=	CRYPT_S390_PRIORITY,
 	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,
 	.cra_blocksize	=	SHA1_BLOCK_SIZE,
-	.cra_ctxsize	=	sizeof(struct s390_sha1_ctx),
+	.cra_ctxsize	=	sizeof(struct s390_sha_ctx),
 	.cra_module	=	THIS_MODULE,
 	.cra_list	=	LIST_HEAD_INIT(alg.cra_list),
 	.cra_u		=	{ .digest = {
 	.dia_digestsize	=	SHA1_DIGEST_SIZE,
 	.dia_init	=	sha1_init,
-	.dia_update	=	sha1_update,
-	.dia_final	=	sha1_final } }
+	.dia_update	=	s390_sha_update,
+	.dia_final	=	s390_sha1_final } }
 };
 
 static int __init sha1_s390_init(void)
_