From e1500bdba46c85e51703c2fa2ad43658cd6ca168 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:13:45 +0200 Subject: [PATCH] --- yaml --- r: 65432 b: refs/heads/master c: 1fd10ed659d6840850311e991ee3ba78e9e5a4a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/Makefile | 4 ++-- trunk/arch/i386/mm/{ioremap.c => ioremap_32.c} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/i386/mm/{ioremap.c => ioremap_32.c} (100%) 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