From ad81eb91731fe7e43ce5c91278bc33bded6cbda1 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Sun, 11 Nov 2007 18:43:33 +0900
Subject: [PATCH] sh: Split out ioremap in to _32 and _64 variants.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
 arch/sh/mm/Makefile_32                         |  2 +-
 arch/sh/mm/Makefile_64                         |  5 +++++
 arch/sh/mm/{ioremap.c => ioremap_32.c}         |  0
 arch/{sh64/mm/ioremap.c => sh/mm/ioremap_64.c} | 13 ++++++-------
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename arch/sh/mm/{ioremap.c => ioremap_32.c} (100%)
 rename arch/{sh64/mm/ioremap.c => sh/mm/ioremap_64.c} (98%)

diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32
index cc68b265c025..b43884269c2a 100644
--- a/arch/sh/mm/Makefile_32
+++ b/arch/sh/mm/Makefile_32
@@ -13,7 +13,7 @@ endif
 
 mmu-y			:= tlb-nommu.o pg-nommu.o
 mmu-$(CONFIG_MMU)	:= fault.o clear_page.o copy_page.o tlb-flush.o	\
-			   ioremap.o
+			   ioremap_32.o
 
 obj-y			+= $(mmu-y)
 
diff --git a/arch/sh/mm/Makefile_64 b/arch/sh/mm/Makefile_64
index de964a1500f4..177f92863e4e 100644
--- a/arch/sh/mm/Makefile_64
+++ b/arch/sh/mm/Makefile_64
@@ -4,6 +4,11 @@
 
 obj-y			:= init.o extable_64.o consistent.o
 
+mmu-y			:= tlb-nommu.o pg-nommu.o
+mmu-$(CONFIG_MMU)	:= ioremap_64.o
+
+obj-y			+= $(mmu-y)
+
 obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o
 obj-$(CONFIG_PMB)		+= pmb.o
 obj-$(CONFIG_NUMA)		+= numa.o
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap_32.c
similarity index 100%
rename from arch/sh/mm/ioremap.c
rename to arch/sh/mm/ioremap_32.c
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh/mm/ioremap_64.c
similarity index 98%
rename from arch/sh64/mm/ioremap.c
rename to arch/sh/mm/ioremap_64.c
index 535304e6601f..95c85e2e43cf 100644
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh/mm/ioremap_64.c
@@ -13,18 +13,17 @@
  *
  *   (C) Copyright 1995 1996 Linus Torvalds
  */
-#include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/io.h>
 #include <linux/ioport.h>
-#include <linux/bootmem.h>
-#include <linux/proc_fs.h>
 #include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/io.h>
+#include <asm/page.h>
 #include <asm/pgalloc.h>
+#include <asm/addrspace.h>
+#include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
+#include <asm/mmu.h>
 
 static void shmedia_mapioaddr(unsigned long, unsigned long);
 static unsigned long shmedia_ioremap(struct resource *, u32, int);
-- 
2.20.1