diff --git a/[refs] b/[refs]
index 2dc8364ae92f..856a14044976 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21767fad2ba94675bcf49c0796b4b2a65702c974
+refs/heads/master: e72ba5136d3c56eaf6a9654e2f8545354c196efc
diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile
index 6b510f97cab5..6bdf7d824f4c 100644
--- a/trunk/arch/x86_64/lib/Makefile
+++ b/trunk/arch/x86_64/lib/Makefile
@@ -4,7 +4,7 @@
 
 CFLAGS_csum-partial_64.o := -funroll-loops
 
-obj-y := io.o iomap_copy_64.o
+obj-y := io_64.o iomap_copy_64.o
 obj-$(CONFIG_SMP)	+= msr-on-cpu.o
 
 lib-y := csum-partial_64.o csum-copy_64.o csum-wrappers_64.o delay_64.o \
diff --git a/trunk/arch/x86_64/lib/io.c b/trunk/arch/x86_64/lib/io_64.c
similarity index 100%
rename from trunk/arch/x86_64/lib/io.c
rename to trunk/arch/x86_64/lib/io_64.c