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

Fix rejects between git-x86 and git-cryptodev

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/s390/crypto/aes_s390.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff -puN arch/x86/crypto/Makefile~git-cryptodev-fixup arch/x86/crypto/Makefile
diff -puN arch/s390/crypto/aes_s390.c~git-cryptodev-fixup arch/s390/crypto/aes_s390.c
--- a/arch/s390/crypto/aes_s390.c~git-cryptodev-fixup
+++ a/arch/s390/crypto/aes_s390.c
@@ -514,14 +514,10 @@ static int __init aes_init(void)
 		return -EOPNOTSUPP;
 
 	/* z9 109 and z9 BC/EC only support 128 bit key length */
-	if (keylen_flag == AES_KEYLEN_128) {
-		aes_alg.cra_u.cipher.cia_max_keysize = AES_MIN_KEY_SIZE;
-		ecb_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE;
-		cbc_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE;
+	if (keylen_flag == AES_KEYLEN_128)
 		printk(KERN_INFO
 		       "aes_s390: hardware acceleration only available for "
 		       "128 bit keys\n");
-	}
 
 	ret = crypto_register_alg(&aes_alg);
 	if (ret)
_