git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
frv
/
mm
/
kmap.c
diff --git
a/arch/frv/mm/kmap.c
b/arch/frv/mm/kmap.c
index
c54f18e
..
fb78be3
100644
(file)
--- a/
arch/frv/mm/kmap.c
+++ b/
arch/frv/mm/kmap.c
@@
-10,7
+10,6
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@
-31,15
+30,15
@@
* Map some physical address range into the kernel address space.
*/
* Map some physical address range into the kernel address space.
*/
-void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
+void
__iomem
*__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
{
{
- return (void *)physaddr;
+ return (void
__iomem
*)physaddr;
}
/*
* Unmap a ioremap()ed region again
*/
}
/*
* Unmap a ioremap()ed region again
*/
-void iounmap(void *addr)
+void iounmap(void
volatile __iomem
*addr)
{
}
{
}