aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Makefile2
-rw-r--r--crypto/aes_generic.c (renamed from crypto/aes.c)2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index a624cbc188fc..b6ef5e4f1ab4 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
39obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o 39obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
40obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o 40obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
41obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o 41obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
42obj-$(CONFIG_CRYPTO_AES) += aes.o 42obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
43obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o 43obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o
44obj-$(CONFIG_CRYPTO_CAST5) += cast5.o 44obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
45obj-$(CONFIG_CRYPTO_CAST6) += cast6.o 45obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
diff --git a/crypto/aes.c b/crypto/aes_generic.c
index e2440773878c..9401dca85e87 100644
--- a/crypto/aes.c
+++ b/crypto/aes_generic.c
@@ -453,4 +453,4 @@ module_exit(aes_fini);
453 453
454MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm"); 454MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
455MODULE_LICENSE("Dual BSD/GPL"); 455MODULE_LICENSE("Dual BSD/GPL");
456 456MODULE_ALIAS("aes");