diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:57:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:57:09 -0700 |
| commit | 904e0ab54b7591b9cb01cfc0dbbedcc8bc0d949b (patch) | |
| tree | 13a2fc98fc7b347fe0d18cc18d452f1f49bff582 /crypto/wp512.c | |
| parent | 98a1e95f9b5919b55c71a01546415074282d30d5 (diff) | |
| parent | c49a7f182c44c31ea460093eb263110824f6c98e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[HWRNG] omap: Minor updates
[CRYPTO] kconfig: Ordering cleanup
[CRYPTO] all: Clean up init()/fini()
[CRYPTO] padlock-aes: Use generic setkey function
[CRYPTO] aes: Export generic setkey
[CRYPTO] api: Make the crypto subsystem fully modular
[CRYPTO] cts: Add CTS mode required for Kerberos AES support
[CRYPTO] lrw: Replace all adds to big endians variables with be*_add_cpu
[CRYPTO] tcrypt: Change the XTEA test vectors
[CRYPTO] tcrypt: Shrink the tcrypt module
[CRYPTO] tcrypt: Change the usage of the test vectors
[CRYPTO] api: Constify function pointer tables
[CRYPTO] aes-x86-32: Remove unused return code
[CRYPTO] tcrypt: Shrink speed templates
[CRYPTO] tcrypt: Group common speed templates
[CRYPTO] sha512: Rename sha512 to sha512_generic
[CRYPTO] sha384: Hardware acceleration for s390
[CRYPTO] sha512: Hardware acceleration for s390
[CRYPTO] s390: Generic sha_update and sha_final
[CRYPTO] api: Switch to proc_create()
Diffstat (limited to 'crypto/wp512.c')
| -rw-r--r-- | crypto/wp512.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/wp512.c b/crypto/wp512.c index f746952b93fc..bff28560d66d 100644 --- a/crypto/wp512.c +++ b/crypto/wp512.c @@ -1146,7 +1146,7 @@ static struct crypto_alg wp256 = { .dia_final = wp256_final } } }; -static int __init init(void) +static int __init wp512_mod_init(void) { int ret = 0; @@ -1172,7 +1172,7 @@ out: return ret; } -static void __exit fini(void) +static void __exit wp512_mod_fini(void) { crypto_unregister_alg(&wp512); crypto_unregister_alg(&wp384); @@ -1182,8 +1182,8 @@ static void __exit fini(void) MODULE_ALIAS("wp384"); MODULE_ALIAS("wp256"); -module_init(init); -module_exit(fini); +module_init(wp512_mod_init); +module_exit(wp512_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Whirlpool Message Digest Algorithm"); |