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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-kirkwood/include/mach/io.h
b/arch/arm/mach-kirkwood/include/mach/io.h
index
44e8be0
..
1aaddc3
100644
(file)
--- a/
arch/arm/mach-kirkwood/include/mach/io.h
+++ b/
arch/arm/mach-kirkwood/include/mach/io.h
@@
-42,8
+42,8
@@
__arch_iounmap(void __iomem *addr)
__iounmap(addr);
}
-#define __arch_ioremap
(p, s, m) __arch_ioremap(p, s, m)
-#define __arch_iounmap
(a) __arch_iounmap(a)
+#define __arch_ioremap
__arch_ioremap
+#define __arch_iounmap
__arch_iounmap
#define __io(a) __io(a)
#define __mem_pci(a) (a)