diff --git a/[refs] b/[refs]
index 8655d9b27d22..0004e0abbcb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55f98f1a26ff6cbed6189ec90143cc5c428d5b78
+refs/heads/master: 359fd6de61fc8777316709fb79047c480b3eae0d
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile
index 4d7c5af4765d..362b4ad082de 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_32.o pgtable_32.o fault.o ioremap_32.o extable_32.o pageattr_32.o mmap_32.o
+obj-y	:= init_32.o pgtable_32.o fault_32.o ioremap_32.o extable_32.o pageattr_32.o mmap_32.o
 
 obj-$(CONFIG_NUMA) += discontig_32.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/trunk/arch/i386/mm/fault.c b/trunk/arch/i386/mm/fault_32.c
similarity index 100%
rename from trunk/arch/i386/mm/fault.c
rename to trunk/arch/i386/mm/fault_32.c