diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-02 11:29:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-02 11:29:07 +0000 |
| commit | 692d96aa22dea8bb80018c6a76556ad6afd464a6 (patch) | |
| tree | e8dd55655fa001e53058c5264d541f8b3d3c1a7b /arch/x86/crypto/camellia_aesni_avx_glue.c | |
| parent | 1874098820e8269fe88d67bc08c908134dd87102 (diff) | |
| parent | 4227cffc1f9e4a9241071354476c225705b614c8 (diff) | |
Merge tag 'v3.10.67' into linux-linaro-lsk
This is the 3.10.67 stable release
Diffstat (limited to 'arch/x86/crypto/camellia_aesni_avx_glue.c')
| -rw-r--r-- | arch/x86/crypto/camellia_aesni_avx_glue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/camellia_aesni_avx_glue.c b/arch/x86/crypto/camellia_aesni_avx_glue.c index 37fd0c0a81ea..883e1af10dc5 100644 --- a/arch/x86/crypto/camellia_aesni_avx_glue.c +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c @@ -574,5 +574,5 @@ module_exit(camellia_aesni_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX optimized"); -MODULE_ALIAS("camellia"); -MODULE_ALIAS("camellia-asm"); +MODULE_ALIAS_CRYPTO("camellia"); +MODULE_ALIAS_CRYPTO("camellia-asm"); |