diff --git a/[refs] b/[refs]
index d9eb43f7eb1d..300a9844acb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2be2056cee405f3e3ca07e197ecd803e81cf5cb6
+refs/heads/master: 282317dc1570c392d1593869ded36baeee8f1d54
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index 4d3ae15445d2..1bd9b85b03cc 100644
--- a/trunk/arch/i386/lib/Makefile
+++ b/trunk/arch/i386/lib/Makefile
@@ -4,7 +4,7 @@
 
 
 lib-y = checksum_32.o delay.o usercopy.o getuser.o putuser.o memcpy.o strstr_32.o \
-	bitops.o semaphore.o string.o
+	bitops.o semaphore.o string_32.o
 
 lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
 
diff --git a/trunk/arch/i386/lib/string.c b/trunk/arch/i386/lib/string_32.c
similarity index 100%
rename from trunk/arch/i386/lib/string.c
rename to trunk/arch/i386/lib/string_32.c