i2c/isp1301_omap: Build fixes

[safe/jmp/linux-2.6] / arch / s390 / crypto / aes_s390.c

diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 46c9705..e33f32b 100644 (file)
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -499,7 +499,7 @@ static struct crypto_alg cbc_aes_alg = {
        }
 };
 
-static int __init aes_init(void)
+static int __init aes_s390_init(void)
 {
        int ret;
 
@@ -516,7 +516,7 @@ static int __init aes_init(void)
        /* z9 109 and z9 BC/EC only support 128 bit key length */
        if (keylen_flag == AES_KEYLEN_128)
                printk(KERN_INFO
-                      "aes_s390: hardware acceleration only available for"
+                      "aes_s390: hardware acceleration only available for "
                       "128 bit keys\n");
 
        ret = crypto_register_alg(&aes_alg);
@@ -542,15 +542,15 @@ aes_err:
        goto out;
 }
 
-static void __exit aes_fini(void)
+static void __exit aes_s390_fini(void)
 {
        crypto_unregister_alg(&cbc_aes_alg);
        crypto_unregister_alg(&ecb_aes_alg);
        crypto_unregister_alg(&aes_alg);
 }
 
-module_init(aes_init);
-module_exit(aes_fini);
+module_init(aes_s390_init);
+module_exit(aes_s390_fini);
 
 MODULE_ALIAS("aes");