---

yaml --- r: 181106 b: refs/heads/master c: 0b59e38 h: refs/heads/master v: v3
git-mirror · Jan 18, 2010 · b0df56c · b0df56c
1 parent 59eb252
commit b0df56c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 49 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edf711b66f2a8a9629aa253ad8b3a5a03b5d7af5
+refs/heads/master: 0b59e38ffaf7b201ff6afe5b736365d16848c7e3
diff --git a/trunk/arch/sh/mm/Makefile b/trunk/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/trunk/arch/sh/mm/ioremap_32.c → trunk/arch/sh/mm/ioremap.c b/trunk/arch/sh/mm/ioremap_32.c → trunk/arch/sh/mm/ioremap.c
diff --git a/trunk/arch/sh/mm/ioremap_64.c b/trunk/arch/sh/mm/ioremap_64.c