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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-arm
/
arch-iop3xx
/
io.h
diff --git
a/include/asm-arm/arch-iop3xx/io.h
b/include/asm-arm/arch-iop3xx/io.h
index
f39046a
..
36adbdf
100644
(file)
--- a/
include/asm-arm/arch-iop3xx/io.h
+++ b/
include/asm-arm/arch-iop3xx/io.h
@@
-17,6
+17,5
@@
#define __io(p) ((void __iomem *)(p))
#define __mem_pci(a) (a)
#define __io(p) ((void __iomem *)(p))
#define __mem_pci(a) (a)
-#define __mem_isa(a) (a)
#endif
#endif