---

yaml --- r: 250401 b: refs/heads/master c: 593732b h: refs/heads/master i: 250399: 68f4b7e v: v3
git-mirror · May 24, 2011 · 6ea3961 · 6ea3961
1 parent bdc5e1d
commit 6ea3961
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 44 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92474a2513e828c27e371728845f24cef98748b2
+refs/heads/master: 593732bd41a6f16eeed9880ae7d51920fc5350ff
diff --git a/trunk/arch/m68k/include/asm/io_no.h b/trunk/arch/m68k/include/asm/io_no.h
@@ -144,8 +144,10 @@ static inline void io_insl(unsigned int addr, void *buf, int len)
 #define IOMAP_NOCACHE_NONSER		2
 #define IOMAP_WRITETHROUGH		3
 
-extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
-
+static inline void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
+{
+	return (void *) physaddr;
+}
 static inline void *ioremap(unsigned long physaddr, unsigned long size)
 {
 	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
@@ -163,7 +165,7 @@ static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size
 	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
 }
 
-extern void iounmap(void *addr);
+#define	iounmap(addr)	do { } while(0)
 
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem

diff --git a/trunk/arch/m68k/kernel/m68k_ksyms_no.c b/trunk/arch/m68k/kernel/m68k_ksyms_no.c
@@ -20,8 +20,6 @@ extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 
 /* platform dependent support */
 
-EXPORT_SYMBOL(__ioremap);
-EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(dump_fpu);
 
 EXPORT_SYMBOL(ip_fast_csum);

diff --git a/trunk/arch/m68k/mm/Makefile_no b/trunk/arch/m68k/mm/Makefile_no
@@ -2,4 +2,4 @@
 # Makefile for the linux m68knommu specific parts of the memory manager.
 #
 
-obj-y += init.o kmap.o
+obj-y += init.o
diff --git a/trunk/arch/m68k/mm/kmap_no.c b/trunk/arch/m68k/mm/kmap_no.c