diff --git a/[refs] b/[refs]
index 246704904f8f..900e8f616cc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fd10ed659d6840850311e991ee3ba78e9e5a4a4
+refs/heads/master: 6e5191ef150947ed6e42751010e4932436e70ec9
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile
index f4ff3aca1a90..643b57b82f3b 100644
--- a/trunk/arch/i386/mm/Makefile
+++ b/trunk/arch/i386/mm/Makefile
@@ -4,7 +4,7 @@
 
 obj-y	:= init.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap.o
 
-obj-$(CONFIG_NUMA) += discontig.o
+obj-$(CONFIG_NUMA) += discontig_32.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap_32.o
diff --git a/trunk/arch/i386/mm/discontig.c b/trunk/arch/i386/mm/discontig_32.c
similarity index 100%
rename from trunk/arch/i386/mm/discontig.c
rename to trunk/arch/i386/mm/discontig_32.c