Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / s390 / crypto / zcrypt_mono.c

diff --git a/drivers/s390/crypto/zcrypt_mono.c b/drivers/s390/crypto/zcrypt_mono.c
index 2a9349ad68b7e20848fc909582a5a08f8d842aba..44253fdd41364436a6057d1100bba3f0a93892fe 100644 (file)
--- a/drivers/s390/crypto/zcrypt_mono.c
+++ b/drivers/s390/crypto/zcrypt_mono.c
@@ -45,7 +45,7 @@
 /**
  * The module initialization code.
  */
-int __init zcrypt_init(void)
+static int __init zcrypt_init(void)
 {
        int rc;
 
@@ -86,7 +86,7 @@ out:
 /**
  * The module termination code.
  */
-void __exit zcrypt_exit(void)
+static void __exit zcrypt_exit(void)
 {
        zcrypt_cex2a_exit();
        zcrypt_pcixcc_exit();