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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop33x
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-iop33x/include/mach/io.h
b/arch/arm/mach-iop33x/include/mach/io.h
index
e99a7ed
..
39e893e
100644
(file)
--- a/
arch/arm/mach-iop33x/include/mach/io.h
+++ b/
arch/arm/mach-iop33x/include/mach/io.h
@@
-21,7
+21,7
@@
extern void __iop3xx_iounmap(void __iomem *addr);
#define __io(p) ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))
#define __mem_pci(a) (a)
#define __io(p) ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))
#define __mem_pci(a) (a)
-#define __arch_ioremap
(a, s, f) __iop3xx_ioremap(a, s, f)
-#define __arch_iounmap
(a) __iop3xx_iounmap(a)
+#define __arch_ioremap
__iop3xx_ioremap
+#define __arch_iounmap
__iop3xx_iounmap
#endif
#endif