From 67b8b7cc97ffd79276384bf373a1ce2693d4b354 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 4 Nov 2010 16:17:43 +1000 Subject: [PATCH] --- yaml --- r: 231817 b: refs/heads/master c: 63e83c8a52031555b1e724f98a33f1838dee6345 h: refs/heads/master i: 231815: d316f0e7a7112f06477577e267ce0039f42a29b9 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/io_no.h | 1 - trunk/arch/m68knommu/mm/kmap.c | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e6db168a2bee..47d2586f6721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b00b766d0cca46133955ea8f19f6d259ad854797 +refs/heads/master: 63e83c8a52031555b1e724f98a33f1838dee6345 diff --git a/trunk/arch/m68k/include/asm/io_no.h b/trunk/arch/m68k/include/asm/io_no.h index 6e2413e518cb..cf20f3097af6 100644 --- a/trunk/arch/m68k/include/asm/io_no.h +++ b/trunk/arch/m68k/include/asm/io_no.h @@ -145,7 +145,6 @@ static inline void io_insl(unsigned int addr, void *buf, int len) #define IOMAP_WRITETHROUGH 3 extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag); -extern void __iounmap(void *addr, unsigned long size); static inline void *ioremap(unsigned long physaddr, unsigned long size) { diff --git a/trunk/arch/m68knommu/mm/kmap.c b/trunk/arch/m68knommu/mm/kmap.c index 902c1dfda9e5..ece8d5ad4e6c 100644 --- a/trunk/arch/m68knommu/mm/kmap.c +++ b/trunk/arch/m68knommu/mm/kmap.c @@ -35,15 +35,6 @@ void iounmap(void *addr) { } -/* - * __iounmap unmaps nearly everything, so be careful - * it doesn't free currently pointer/page tables anymore but it - * wans't used anyway and might be added later. - */ -void __iounmap(void *addr, unsigned long size) -{ -} - /* * Set new cache mode for some kernel address space. * The caller must push data for that range itself, if such data may already