diff --git a/[refs] b/[refs]
index 9d1b765fc17e..6fa92f502b27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584d92415b5c4e93e2bc3d18756815758f2a1f07
+refs/heads/master: d7eb5e98f45e88762676744f1ab0f7f4c1354fb9
diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile
index 7157801093af..3e12aa58d453 100644
--- a/trunk/arch/x86_64/lib/Makefile
+++ b/trunk/arch/x86_64/lib/Makefile
@@ -9,5 +9,5 @@ obj-$(CONFIG_SMP)	+= msr-on-cpu.o
 
 lib-y := csum-partial.o csum-copy_64.o csum-wrappers_64.o delay.o \
 	usercopy_64.o getuser_64.o putuser.o  \
-	thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops.o
+	thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops_64.o
 lib-y += memcpy_64.o memmove_64.o memset.o copy_user.o rwlock_64.o copy_user_nocache_64.o
diff --git a/trunk/arch/x86_64/lib/bitops.c b/trunk/arch/x86_64/lib/bitops_64.c
similarity index 100%
rename from trunk/arch/x86_64/lib/bitops.c
rename to trunk/arch/x86_64/lib/bitops_64.c