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

blah.  Guys, talk to each other...

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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/s390/crypto/sha1_s390.c~git-cryptodev-fix-conflict-hack arch/s390/crypto/sha1_s390.c
--- a/arch/s390/crypto/sha1_s390.c~git-cryptodev-fix-conflict-hack
+++ a/arch/s390/crypto/sha1_s390.c
@@ -57,7 +57,7 @@ static struct crypto_alg alg = {
 	.dia_digestsize	=	SHA1_DIGEST_SIZE,
 	.dia_init	=	sha1_init,
 	.dia_update	=	s390_sha_update,
-	.dia_final	=	s390_sha1_final } }
+	.dia_final	=	NULL } }
 };
 
 static int __init sha1_s390_init(void)
_