sh: Merge _32/_64 ioremap implementations.

There is nothing of interest in the _64 version anymore, so the _32 one can be renamed and used unconditionally. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Jan 18, 2010 · 0b59e38 · 0b59e38
1 parent edf711b
commit 0b59e38
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 48 deletions.
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
@@ -15,7 +15,7 @@ obj-y			+= $(cacheops-y)
 
 mmu-y			:= nommu.o extable_32.o
 mmu-$(CONFIG_MMU)	:= extable_$(BITS).o fault_$(BITS).o \
-			   ioremap_$(BITS).o kmap.o pgtable.o tlbflush_$(BITS).o
+			   ioremap.o kmap.o pgtable.o tlbflush_$(BITS).o
 
 obj-y			+= $(mmu-y)
 obj-$(CONFIG_DEBUG_FS)	+= asids-debugfs.o

diff --git a/arch/sh/mm/ioremap_32.c → arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap_32.c → arch/sh/mm/ioremap.c
diff --git a/arch/sh/mm/ioremap_64.c b/arch/sh/mm/ioremap_64.c