---

yaml --- r: 80516 b: refs/heads/master c: e64c8aa h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · 23b7c74 · 23b7c74
1 parent 745ad88
commit 23b7c74
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 466 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 240d3a7c47e3fb9c2533f63e9e323a25d91d0643
+refs/heads/master: e64c8aa0c5e5d23730b2d702297e01cd7fe53144
diff --git a/trunk/arch/x86/mm/Makefile_32 b/trunk/arch/x86/mm/Makefile_32
@@ -2,7 +2,7 @@
 # Makefile for the linux i386-specific parts of the memory manager.
 #
 
-obj-y	:= init_32.o pgtable_32.o fault_32.o ioremap_32.o extable.o pageattr.o mmap.o
+obj-y	:= init_32.o pgtable_32.o fault_32.o ioremap.o extable.o pageattr.o mmap.o
 
 obj-$(CONFIG_CPA_DEBUG) += pageattr-test.o
 obj-$(CONFIG_NUMA) += discontig_32.o

diff --git a/trunk/arch/x86/mm/Makefile_64 b/trunk/arch/x86/mm/Makefile_64
@@ -2,7 +2,7 @@
 # Makefile for the linux x86_64-specific parts of the memory manager.
 #
 
-obj-y	 := init_64.o fault_64.o ioremap_64.o extable.o pageattr.o mmap.o
+obj-y	 := init_64.o fault_64.o ioremap.o extable.o pageattr.o mmap.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA) += numa_64.o
 obj-$(CONFIG_K8_NUMA) += k8topology_64.o

diff --git a/trunk/arch/x86/mm/ioremap_32.c → trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap_32.c → trunk/arch/x86/mm/ioremap.c