diff --git a/[refs] b/[refs]
index 900e8f616cc2..98dc59c3a01d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e5191ef150947ed6e42751010e4932436e70ec9
+refs/heads/master: afb5ce0671f8b14f15525fd3e952b4a989c94a6b
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile
index 643b57b82f3b..fb0a4f3bbdf8 100644
--- a/trunk/arch/i386/mm/Makefile
+++ b/trunk/arch/i386/mm/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux i386-specific parts of the memory manager.
 #
 
-obj-y	:= init.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap.o
+obj-y	:= init_32.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap.o
 
 obj-$(CONFIG_NUMA) += discontig_32.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/trunk/arch/i386/mm/init.c b/trunk/arch/i386/mm/init_32.c
similarity index 100%
rename from trunk/arch/i386/mm/init.c
rename to trunk/arch/i386/mm/init_32.c