diff --git a/[refs] b/[refs]
index 300a9844acb1..dd2a8f94a8b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 282317dc1570c392d1593869ded36baeee8f1d54
+refs/heads/master: bb3871daf6d95101220969dc2634456cf2c503da
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index 1bd9b85b03cc..dce510d443aa 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_32.o
+	bitops.o semaphore_32.o string_32.o
 
 lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
 
diff --git a/trunk/arch/i386/lib/semaphore.S b/trunk/arch/i386/lib/semaphore_32.S
similarity index 100%
rename from trunk/arch/i386/lib/semaphore.S
rename to trunk/arch/i386/lib/semaphore_32.S