---

yaml --- r: 3178 b: refs/heads/master c: 7533fca h: refs/heads/master v: v3
git-mirror · Jun 24, 2005 · 0bde4aa · 0bde4aa
1 parent f8bcdb4
commit 0bde4aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79042f087b5ac7bba819de03dc3e7462bab8aad9
+refs/heads/master: 7533fca8e866ee7355ca53f1216e3fa4c718f991
diff --git a/trunk/include/asm-arm/io.h b/trunk/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;