diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /crypto/crypto_null.c | |
| parent | [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash (diff) | |
| parent | slab_err: Pass parameters correctly to slab_bug (diff) | |
| download | linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz linux-36d99df2fb474222ab47fbe8ae7385661033223b.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'crypto/crypto_null.c')
| -rw-r--r-- | crypto/crypto_null.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c index ff7b3de1bcfd..1f7d53013a22 100644 --- a/crypto/crypto_null.c +++ b/crypto/crypto_null.c @@ -142,7 +142,7 @@ MODULE_ALIAS("compress_null"); MODULE_ALIAS("digest_null"); MODULE_ALIAS("cipher_null"); -static int __init init(void) +static int __init crypto_null_mod_init(void) { int ret = 0; @@ -174,7 +174,7 @@ out_unregister_cipher: goto out; } -static void __exit fini(void) +static void __exit crypto_null_mod_fini(void) { crypto_unregister_alg(&compress_null); crypto_unregister_alg(&digest_null); @@ -182,8 +182,8 @@ static void __exit fini(void) crypto_unregister_alg(&cipher_null); } -module_init(init); -module_exit(fini); +module_init(crypto_null_mod_init); +module_exit(crypto_null_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Null Cryptographic Algorithms"); |