diff --git a/[refs] b/[refs]
index ffcfd0143832..a15d92934c35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94577c112487d68db4f258bd19cfc7100480d0cc
+refs/heads/master: 1c9541c7bc437c4d1bcad1e56770622c24e634a1
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile
index c5ae6432203d..78c242ccaed0 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.o fault.o ioremap_32.o extable_32.o pageattr.o mmap_32.o
+obj-y	:= init_32.o pgtable_32.o fault.o ioremap_32.o extable_32.o pageattr.o mmap_32.o
 
 obj-$(CONFIG_NUMA) += discontig_32.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/trunk/arch/i386/mm/pgtable.c b/trunk/arch/i386/mm/pgtable_32.c
similarity index 100%
rename from trunk/arch/i386/mm/pgtable.c
rename to trunk/arch/i386/mm/pgtable_32.c