Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 075e39df authored Mar 05, 2012 by Jussi Kivilinna Committed by Herbert Xu Mar 14, 2012

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>

parent 4de59337

crypto/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,8 @@ obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
	obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o		obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
	obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o		obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o
	obj-$(CONFIG_CRYPTO_AES) += aes_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_CAST5) += cast5.o
	obj-$(CONFIG_CRYPTO_CAST6) += cast6.o		obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
	obj-$(CONFIG_CRYPTO_ARC4) += arc4.o		obj-$(CONFIG_CRYPTO_ARC4) += arc4.o

crypto/camellia.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1096,3 +1096,4 @@ module_exit(camellia_fini);

	MODULE_DESCRIPTION("Camellia Cipher Algorithm");		MODULE_DESCRIPTION("Camellia Cipher Algorithm");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
			MODULE_ALIAS("camellia");