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 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp23xx
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-ixp23xx/include/mach/io.h
b/arch/arm/mach-ixp23xx/include/mach/io.h
index
fd9ef8e
..
a1749d0
100644
(file)
--- a/
arch/arm/mach-ixp23xx/include/mach/io.h
+++ b/
arch/arm/mach-ixp23xx/include/mach/io.h
@@
-45,8
+45,8
@@
ixp23xx_iounmap(void __iomem *addr)
__iounmap(addr);
}
-#define __arch_ioremap
(a,s,f) ixp23xx_ioremap(a,s,f)
-#define __arch_iounmap
(a) ixp23xx_iounmap(a)
+#define __arch_ioremap
ixp23xx_ioremap
+#define __arch_iounmap
ixp23xx_iounmap
#endif