diff --git a/[refs] b/[refs]
index 15d17b19c681..e0d867c8e746 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a273b2b46f9e57bd0bc1f4b905e28d2f947588d
+refs/heads/master: 018977f6e7f11b08a5928641454f4c43a9b1ca43
diff --git a/trunk/arch/i386/crypto/Makefile b/trunk/arch/i386/crypto/Makefile
index 57fcb333c9c1..cd1038a22dd3 100644
--- a/trunk/arch/i386/crypto/Makefile
+++ b/trunk/arch/i386/crypto/Makefile
@@ -7,6 +7,6 @@
 obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
 obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
 
-aes-i586-y := aes-i586-asm.o aes.o
+aes-i586-y := aes-i586-asm_32.o aes.o
 twofish-i586-y := twofish-i586-asm.o twofish_32.o
 
diff --git a/trunk/arch/i386/crypto/aes-i586-asm.S b/trunk/arch/i386/crypto/aes-i586-asm_32.S
similarity index 100%
rename from trunk/arch/i386/crypto/aes-i586-asm.S
rename to trunk/arch/i386/crypto/aes-i586-asm_32.S