From b51dda1fe28e0d8173c9a5b956e6adf1e7d18059 Mon Sep 17 00:00:00 2001
From: Sebastian Siewior <sebastian@breakpoint.cc>
Date: Fri, 5 Oct 2007 16:52:01 +0800
Subject: [PATCH] --- yaml --- r: 67036 b: refs/heads/master c:
 f8246af005d56b73f4f04304fc5b6fd9878af4ef h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/s390/crypto/aes_s390.c     | 2 +-
 trunk/crypto/Makefile                 | 2 +-
 trunk/crypto/{aes.c => aes_generic.c} | 2 +-
 trunk/drivers/crypto/geode-aes.c      | 1 +
 trunk/drivers/crypto/padlock-aes.c    | 4 ++--
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename trunk/crypto/{aes.c => aes_generic.c} (99%)

diff --git a/[refs] b/[refs]
index 6858b2a4d649..2d3e46cd7641 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5a511f1cd6f90a98ad11dd97e2313c7c787deb2
+refs/heads/master: f8246af005d56b73f4f04304fc5b6fd9878af4ef
diff --git a/trunk/arch/s390/crypto/aes_s390.c b/trunk/arch/s390/crypto/aes_s390.c
index 3660ca6a3306..512669691ad0 100644
--- a/trunk/arch/s390/crypto/aes_s390.c
+++ b/trunk/arch/s390/crypto/aes_s390.c
@@ -7,7 +7,7 @@
  *   Copyright IBM Corp. 2005,2007
  *   Author(s): Jan Glauber (jang@de.ibm.com)
  *
- * Derived from "crypto/aes.c"
+ * Derived from "crypto/aes_generic.c"
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
index a624cbc188fc..b6ef5e4f1ab4 100644
--- a/trunk/crypto/Makefile
+++ b/trunk/crypto/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
 obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
-obj-$(CONFIG_CRYPTO_AES) += aes.o
+obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
 obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
diff --git a/trunk/crypto/aes.c b/trunk/crypto/aes_generic.c
similarity index 99%
rename from trunk/crypto/aes.c
rename to trunk/crypto/aes_generic.c
index e2440773878c..9401dca85e87 100644
--- a/trunk/crypto/aes.c
+++ b/trunk/crypto/aes_generic.c
@@ -453,4 +453,4 @@ module_exit(aes_fini);
 
 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
 MODULE_LICENSE("Dual BSD/GPL");
-
+MODULE_ALIAS("aes");
diff --git a/trunk/drivers/crypto/geode-aes.c b/trunk/drivers/crypto/geode-aes.c
index 6a86958b577f..f9a34abbf4fa 100644
--- a/trunk/drivers/crypto/geode-aes.c
+++ b/trunk/drivers/crypto/geode-aes.c
@@ -473,6 +473,7 @@ geode_aes_exit(void)
 MODULE_AUTHOR("Advanced Micro Devices, Inc.");
 MODULE_DESCRIPTION("Geode LX Hardware AES driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("aes");
 
 module_init(geode_aes_init);
 module_exit(geode_aes_exit);
diff --git a/trunk/drivers/crypto/padlock-aes.c b/trunk/drivers/crypto/padlock-aes.c
index d4501dc7e650..abbcff0762b1 100644
--- a/trunk/drivers/crypto/padlock-aes.c
+++ b/trunk/drivers/crypto/padlock-aes.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2004  Michal Ludvig <michal@logix.cz>
  *
- * Key expansion routine taken from crypto/aes.c
+ * Key expansion routine taken from crypto/aes_generic.c
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -660,4 +660,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algorithm support");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michal Ludvig");
 
-MODULE_ALIAS("aes-padlock");
+MODULE_ALIAS("aes");