diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 01:06:24 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 09:09:02 -0800 |
commit | ad9ec4f8de264903c6b5ba7ae8d8e96432188858 (patch) | |
tree | 9ae7f2625eaa777abdb6b5cb2d505361d37ae675 /include/asm-m68k/zorro.h | |
parent | 9a4729118c8851bce709a00eba1b3a8f1fd9ed58 (diff) | |
download | op-kernel-dev-ad9ec4f8de264903c6b5ba7ae8d8e96432188858.zip op-kernel-dev-ad9ec4f8de264903c6b5ba7ae8d8e96432188858.tar.gz |
[PATCH] m68k: basic iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k/zorro.h')
-rw-r--r-- | include/asm-m68k/zorro.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-m68k/zorro.h b/include/asm-m68k/zorro.h index cf81658..5ce97c2 100644 --- a/include/asm-m68k/zorro.h +++ b/include/asm-m68k/zorro.h @@ -15,24 +15,24 @@ #define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) #define z_memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) -static inline void *z_remap_nocache_ser(unsigned long physaddr, +static inline void __iomem *z_remap_nocache_ser(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -static inline void *z_remap_nocache_nonser(unsigned long physaddr, +static inline void __iomem *z_remap_nocache_nonser(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_NOCACHE_NONSER); } -static inline void *z_remap_writethrough(unsigned long physaddr, +static inline void __iomem *z_remap_writethrough(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); } -static inline void *z_remap_fullcache(unsigned long physaddr, +static inline void __iomem *z_remap_fullcache(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_FULL_CACHING); |