diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-25 00:49:01 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-25 00:49:01 +0400 |
| commit | f50c02831d833a27321388bc595a3c376ae941e4 (patch) | |
| tree | 8a9b29f9d2684a7dab6c20662b10e49f057c8bb6 /include | |
| parent | ff13f98b97cb6c5a2d201dfa4db0a2fd0b4d9d50 (diff) | |
| parent | d2f607484f8210cf19b1730dee26d426a5a770a5 (diff) | |
| download | linux-f50c02831d833a27321388bc595a3c376ae941e4.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index cfa71a0dffb6..5c4ae8f5dbb0 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h @@ -136,9 +136,9 @@ extern void __readwrite_bug(const char *fn); /* * String version of IO memory access ops: */ -extern void _memcpy_fromio(void *, void __iomem *, size_t); -extern void _memcpy_toio(void __iomem *, const void *, size_t); -extern void _memset_io(void __iomem *, int, size_t); +extern void _memcpy_fromio(void *, const volatile void __iomem *, size_t); +extern void _memcpy_toio(volatile void __iomem *, const void *, size_t); +extern void _memset_io(volatile void __iomem *, int, size_t); #define mmiowb() |