diff --git a/[refs] b/[refs]
index a15d92934c35..d3b47d95fdc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c9541c7bc437c4d1bcad1e56770622c24e634a1
+refs/heads/master: b0aeae21da297caad0d6d0608b197e6ef97faf6d
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile
index 78c242ccaed0..2c81ad14a62b 100644
--- a/trunk/arch/i386/mm/Makefile
+++ b/trunk/arch/i386/mm/Makefile
@@ -6,5 +6,5 @@ obj-y	:= init_32.o pgtable_32.o fault.o ioremap_32.o extable_32.o pageattr.o mma
 
 obj-$(CONFIG_NUMA) += discontig_32.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_HIGHMEM) += highmem.o
+obj-$(CONFIG_HIGHMEM) += highmem_32.o
 obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap_32.o
diff --git a/trunk/arch/i386/mm/highmem.c b/trunk/arch/i386/mm/highmem_32.c
similarity index 100%
rename from trunk/arch/i386/mm/highmem.c
rename to trunk/arch/i386/mm/highmem_32.c