diff --git a/[refs] b/[refs]
index 53ea1890213f..d9eb43f7eb1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31834147ef934140c9d41afe130ac8606c2d7a81
+refs/heads/master: 2be2056cee405f3e3ca07e197ecd803e81cf5cb6
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index afbc99d2ee88..4d3ae15445d2 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.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_32.o \
 	bitops.o semaphore.o string.o
 
 lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
diff --git a/trunk/arch/i386/lib/strstr.c b/trunk/arch/i386/lib/strstr_32.c
similarity index 100%
rename from trunk/arch/i386/lib/strstr.c
rename to trunk/arch/i386/lib/strstr_32.c