diff --git a/[refs] b/[refs]
index 63a463f7203b..246704904f8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b88467687550507cca30b49217518e8ba8cda4e
+refs/heads/master: 1fd10ed659d6840850311e991ee3ba78e9e5a4a4
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile
index 80908b5aa60f..f4ff3aca1a90 100644
--- a/trunk/arch/i386/mm/Makefile
+++ b/trunk/arch/i386/mm/Makefile
@@ -2,9 +2,9 @@
 # Makefile for the linux i386-specific parts of the memory manager.
 #
 
-obj-y	:= init.o pgtable.o fault.o ioremap.o extable.o pageattr.o mmap.o
+obj-y	:= init.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap.o
 
 obj-$(CONFIG_NUMA) += discontig.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_HIGHMEM) += highmem.o
-obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap.o
+obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap_32.o
diff --git a/trunk/arch/i386/mm/ioremap.c b/trunk/arch/i386/mm/ioremap_32.c
similarity index 100%
rename from trunk/arch/i386/mm/ioremap.c
rename to trunk/arch/i386/mm/ioremap_32.c