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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[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
70576b1
..
f9c7291
100644
(file)
--- a/
include/asm-arm/arch-ebsa285/io.h
+++ b/
include/asm-arm/arch-ebsa285/io.h
@@
-14,6
+14,8
@@
#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
/*
#define IO_SPACE_LIMIT 0xffff
/*
@@
-22,7
+24,6
@@
#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)
@@
-32,14
+33,7
@@
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