From 34329adf05fcbccb1a76d4df3a159e3c1fd53d6a Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:13:55 +0200
Subject: [PATCH] --- yaml --- r: 65439 b: refs/heads/master c:
 b0aeae21da297caad0d6d0608b197e6ef97faf6d h: refs/heads/master i:   65437:
 a3b994f5e21e07d0fa468e93d84ae80014d42e1a   65435:
 43d01344bc750672f426e00ae07e25c80c8eecf4   65431:
 ef325076b999792ead97f62b531c4f13235cc510   65423:
 eaa491299cd4bd8166cc37f45b975ef912ac1387   65407:
 eec7c4b4a1f272f69b48ffaf73d7d2b449164fe2 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/i386/mm/Makefile                    | 2 +-
 trunk/arch/i386/mm/{highmem.c => highmem_32.c} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename trunk/arch/i386/mm/{highmem.c => highmem_32.c} (100%)

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