aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/io.h
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2005-06-24 23:11:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-06-24 23:11:31 +0100
commit7533fca8e866ee7355ca53f1216e3fa4c718f991 (patch)
treeaf4d8698fe1bc32854dcc0c81ed99211e4e53207 /include/asm-arm/io.h
parent79042f087b5ac7bba819de03dc3e7462bab8aad9 (diff)
[PATCH] ARM: 2747/1: allow platforms to provide their own iomap implementation
Patch from Lennert Buytenhek This patch conditionalises the io{read,write}{8,16,32} defines and the prototypes for ioport_map/ioport_unmap in asm-arm/io.h on ioread8 not already having been defined. This is done so that platforms can provide their own implementation of the iomap API, ixp2000 for example needs this. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/io.h')
-rw-r--r--include/asm-arm/io.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index 08a46302d26..cc4b5f5dbfc 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -275,6 +275,7 @@ extern void __iounmap(void __iomem *addr);
/*
* io{read,write}{8,16,32} macros
*/
+#ifndef ioread8
#define ioread8(p) ({ unsigned int __v = __raw_readb(p); __v; })
#define ioread16(p) ({ unsigned int __v = le16_to_cpu(__raw_readw(p)); __v; })
#define ioread32(p) ({ unsigned int __v = le32_to_cpu(__raw_readl(p)); __v; })
@@ -293,6 +294,7 @@ extern void __iounmap(void __iomem *addr);
extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
extern void ioport_unmap(void __iomem *addr);
+#endif
struct pci_dev;