diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 15:32:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 15:32:01 -0700 |
| commit | f647a27417d2adc43d8c96d3d6f837422fbc076e (patch) | |
| tree | 3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /include/asm-arm/io.h | |
| parent | 75043cb5b386e5a01fd03b88f647dd992de02f97 (diff) | |
| parent | 2966207c7e5945947c4db3a48aa4fa819807c5be (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/io.h')
| -rw-r--r-- | include/asm-arm/io.h | 2 |
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; |