git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ebsa285
/
io.h
diff --git
a/include/asm-arm/arch-ebsa285/io.h
b/include/asm-arm/arch-ebsa285/io.h
index
f9c7291
..
776f9d3
100644
(file)
--- a/
include/asm-arm/arch-ebsa285/io.h
+++ b/
include/asm-arm/arch-ebsa285/io.h
@@
-24,6
+24,7
@@
#define __io(a) ((void __iomem *)(PCIO_BASE + (a)))
#if 1
#define __mem_pci(a) (a)
#define __io(a) ((void __iomem *)(PCIO_BASE + (a)))
#if 1
#define __mem_pci(a) (a)
+#define __mem_isa(a) ((a) + PCIMEM_BASE)
#else
static inline void __iomem *___mem_pci(void __iomem *p)
#else
static inline void __iomem *___mem_pci(void __iomem *p)
@@
-33,7
+34,14
@@
static inline void __iomem *___mem_pci(void __iomem *p)
return p;
}
return p;
}
+static inline void __iomem *___mem_isa(void __iomem *p)
+{
+ unsigned long a = (unsigned long)p;
+ BUG_ON(a >= 16*1048576);
+ return p + PCIMEM_BASE;
+}
#define __mem_pci(a) ___mem_pci(a)
#define __mem_pci(a) ___mem_pci(a)
+#define __mem_isa(a) ___mem_isa(a)
#endif
#endif
#endif
#endif