git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
io_no.h
diff --git
a/arch/m68k/include/asm/io_no.h
b/arch/m68k/include/asm/io_no.h
index
6e2413e
..
cf20f30
100644
(file)
--- a/
arch/m68k/include/asm/io_no.h
+++ b/
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)
{