diff --git a/arch/i386/lib/Makefile b/arch/i386/lib/Makefile
index afbc99d2ee88..4d3ae15445d2 100644
--- a/arch/i386/lib/Makefile
+++ b/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/arch/i386/lib/strstr.c b/arch/i386/lib/strstr_32.c
similarity index 100%
rename from arch/i386/lib/strstr.c
rename to arch/i386/lib/strstr_32.c