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
fedora core 6 1.2949 + vserver 2.2.0
[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
8511b2c
..
f9c7291
100644
(file)
--- a/
include/asm-arm/arch-ebsa285/io.h
+++ b/
include/asm-arm/arch-ebsa285/io.h
@@
-14,30
+14,26
@@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
+#include <asm/hardware.h>
+
#define IO_SPACE_LIMIT 0xffff
/*
* Translation of various region addresses to virtual addresses
*/
#define IO_SPACE_LIMIT 0xffff
/*
* Translation of various region addresses to virtual addresses
*/
-#define __io(a) (
PCIO_BASE + (a
))
+#define __io(a) (
(void __iomem *)(PCIO_BASE + (a)
))
#if 1
#if 1
-#define __mem_pci(a) ((unsigned long)(a))
-#define __mem_isa(a) (PCIMEM_BASE + (unsigned long)(a))
+#define __mem_pci(a) (a)
#else
#else
-static inline
unsigned long ___mem_pci(unsigned long a
)
+static inline
void __iomem *___mem_pci(void __iomem *p
)
{
{
+ unsigned long a = (unsigned long)p;
BUG_ON(a <= 0xc0000000 || a >= 0xe0000000);
BUG_ON(a <= 0xc0000000 || a >= 0xe0000000);
- return
a
;
+ return
p
;
}
}
-static inline unsigned long ___mem_isa(unsigned long a)
-{
- BUG_ON(a >= 16*1048576);
- return PCIMEM_BASE + a;
-}
-#define __mem_pci(a) ___mem_pci((unsigned long)(a))
-#define __mem_isa(a) ___mem_isa((unsigned long)(a))
+#define __mem_pci(a) ___mem_pci(a)
#endif
#endif
#endif
#endif