diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 20:20:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 20:20:10 +0100 |
commit | 6d2e91bf80e4410207f01edb0962aec9213f3533 (patch) | |
tree | d9e63711b0958748accff409596eca742a3c360b /arch/s390/crypto/aes_s390.c | |
parent | 6298e719cf388f43b674f43799af467d3e4e5aa7 (diff) | |
parent | dd39ecf522ba86c70809715af46e6557f6491131 (diff) |
Merge branch 'x86/urgent' into x86/mm
Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/crypto/aes_s390.c')
-rw-r--r-- | arch/s390/crypto/aes_s390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index c42cd898f68..6118890c946 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c @@ -556,7 +556,7 @@ static void __exit aes_s390_fini(void) module_init(aes_s390_init); module_exit(aes_s390_fini); -MODULE_ALIAS("aes"); +MODULE_ALIAS("aes-all"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm"); MODULE_LICENSE("GPL"); |