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 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-davinci/include/mach/io.h
b/arch/arm/mach-davinci/include/mach/io.h
index
62b0a90
..
d1b9549
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/io.h
+++ b/
arch/arm/mach-davinci/include/mach/io.h
@@
-22,8
+22,8
@@
#define __mem_isa(a) (a)
#ifndef __ASSEMBLER__
#define __mem_isa(a) (a)
#ifndef __ASSEMBLER__
-#define __arch_ioremap
(p, s, t) davinci_ioremap(p, s, t)
-#define __arch_iounmap
(v) davinci_iounmap(v)
+#define __arch_ioremap
davinci_ioremap
+#define __arch_iounmap
davinci_iounmap
void __iomem *davinci_ioremap(unsigned long phys, size_t size,
unsigned int type);
void __iomem *davinci_ioremap(unsigned long phys, size_t size,
unsigned int type);