diff --git a/[refs] b/[refs]
index 43b705475919..452c3f3c3a5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d1f5420f0d4bd6f391295bb632ae65920983162
+refs/heads/master: 6e696842484ffcf018bba6a46610091ff68f49a8
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index 246a775940ff..c2de356c6935 100644
--- a/trunk/arch/i386/lib/Makefile
+++ b/trunk/arch/i386/lib/Makefile
@@ -3,7 +3,7 @@
 #
 
 
-lib-y = checksum_32.o delay.o usercopy_32.o getuser_32.o putuser.o memcpy_32.o strstr_32.o \
+lib-y = checksum_32.o delay.o usercopy_32.o getuser_32.o putuser_32.o memcpy_32.o strstr_32.o \
 	bitops_32.o semaphore_32.o string_32.o
 
 lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
diff --git a/trunk/arch/i386/lib/putuser.S b/trunk/arch/i386/lib/putuser_32.S
similarity index 100%
rename from trunk/arch/i386/lib/putuser.S
rename to trunk/arch/i386/lib/putuser_32.S