projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[linux-2.6-block.git]
/
arch
/
sh
/
include
/
asm
/
io_generic.h
diff --git
a/arch/sh/include/asm/io_generic.h
b/arch/sh/include/asm/io_generic.h
index 1e5d375f55dce7e4f98236d489e021455373957c..491df93cbf8e3cd3884c3de499fc05d22c1ee7ba 100644
(file)
--- a/
arch/sh/include/asm/io_generic.h
+++ b/
arch/sh/include/asm/io_generic.h
@@
-38,5
+38,6
@@
void IO_CONCAT(__IO_PREFIX,iounmap)(void *addr);
void __iomem *IO_CONCAT(__IO_PREFIX,ioport_map)(unsigned long addr, unsigned int size);
void IO_CONCAT(__IO_PREFIX,ioport_unmap)(void __iomem *addr);
+void IO_CONCAT(__IO_PREFIX,mem_init)(void);
#undef __IO_PREFIX