diff --git a/[refs] b/[refs]
index 170825d62683..53ea1890213f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96c4d6e71d27a2de591d185aa897d2d215f8588e
+refs/heads/master: 31834147ef934140c9d41afe130ac8606c2d7a81
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index 4d105fdfe817..afbc99d2ee88 100644
--- a/trunk/arch/i386/lib/Makefile
+++ b/trunk/arch/i386/lib/Makefile
@@ -3,7 +3,7 @@
 #
 
 
-lib-y = checksum.o delay.o usercopy.o getuser.o putuser.o memcpy.o strstr.o \
+lib-y = checksum_32.o delay.o usercopy.o getuser.o putuser.o memcpy.o strstr.o \
 	bitops.o semaphore.o string.o
 
 lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
diff --git a/trunk/arch/i386/lib/checksum.S b/trunk/arch/i386/lib/checksum_32.S
similarity index 100%
rename from trunk/arch/i386/lib/checksum.S
rename to trunk/arch/i386/lib/checksum_32.S