projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[cascardo/linux.git]
/
arch
/
s390
/
include
/
asm
/
io.h
diff --git
a/arch/s390/include/asm/io.h
b/arch/s390/include/asm/io.h
index
379d96e
..
fd9be01
100644
(file)
--- a/
arch/s390/include/asm/io.h
+++ b/
arch/s390/include/asm/io.h
@@
-36,6
+36,7
@@
static inline void * phys_to_virt(unsigned long address)
}
void *xlate_dev_mem_ptr(unsigned long phys);
+#define xlate_dev_mem_ptr xlate_dev_mem_ptr
void unxlate_dev_mem_ptr(unsigned long phys, void *addr);
/*