crypto: camellia - rename camellia module to camellia_generic

Rename camellia module to camellia_generic to allow optimized assembler
implementations to autoload with module-alias.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Makefile b/crypto/Makefile
index f638063f4ea93925067aad0e6e7325c5124fedb0..43559438ca515c511dc57b4e3662f5c56a89cac1 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -67,7 +67,8 @@ obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o
 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
-obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o
+camellia_generic-y = camellia.o
+obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
 obj-$(CONFIG_CRYPTO_ARC4) += arc4.o

diff --git a/crypto/camellia.c b/crypto/camellia.c
index 7ae4bcddd1de336dfbabf8c1ad18c7e113d2e7c9..f07a19b3caadb3107e6220b5cb7ab7e2c30d1610 100644 (file)
--- a/crypto/camellia.c
+++ b/crypto/camellia.c
@@ -1096,3 +1096,4 @@ module_exit(camellia_fini);
 
 MODULE_DESCRIPTION("Camellia Cipher Algorithm");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("camellia");