diff --git a/[refs] b/[refs]
index 8938d642fc0d..613ec64d36b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bbad2b6f10e1f1a171edae545ea2f84dca8c2da
+refs/heads/master: e585d9617a4c2c8f4d1d19def80158bca2853be8
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index af7f9435d203..553c41d2d79b 100644
--- a/trunk/arch/i386/lib/Makefile
+++ b/trunk/arch/i386/lib/Makefile
@@ -6,6 +6,6 @@
 lib-y = checksum_32.o delay.o usercopy.o getuser.o putuser.o memcpy_32.o strstr_32.o \
 	bitops.o semaphore_32.o string_32.o
 
-lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
+lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
 
 obj-$(CONFIG_SMP)	+= msr-on-cpu.o
diff --git a/trunk/arch/i386/lib/mmx.c b/trunk/arch/i386/lib/mmx_32.c
similarity index 100%
rename from trunk/arch/i386/lib/mmx.c
rename to trunk/arch/i386/lib/mmx_32.c