diff --git a/arch/i386/crypto/Makefile b/arch/i386/crypto/Makefile
index 22671a442958..7154b14cd950 100644
--- a/arch/i386/crypto/Makefile
+++ b/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_32.o aes.o
+aes-i586-y := aes-i586-asm_32.o aes_32.o
 twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
 
diff --git a/arch/i386/crypto/aes.c b/arch/i386/crypto/aes_32.c
similarity index 100%
rename from arch/i386/crypto/aes.c
rename to arch/i386/crypto/aes_32.c