diff --git a/[refs] b/[refs]
index 70b3a7884041..43b705475919 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81f52936d34570f7db3f09bf5e01339b640438ef
+refs/heads/master: 6d1f5420f0d4bd6f391295bb632ae65920983162
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index 2ec0fbf6c1ca..246a775940ff 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_32.o getuser_32.o putuser.o memcpy_32.o strstr_32.o \
-	bitops.o semaphore_32.o string_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/bitops.c b/trunk/arch/i386/lib/bitops_32.c
similarity index 100%
rename from trunk/arch/i386/lib/bitops.c
rename to trunk/arch/i386/lib/bitops_32.c