diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-06 00:41:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-06 00:41:45 -0800 |
| commit | 6da2b234784d0a83114b983f69e88fef9b7b32c6 (patch) | |
| tree | 48df61dbbbc5ec58ca49de66c01b0fcda2da6370 /include | |
| parent | b9b61107f696e231a04f53f3b2ec135db4f666d8 (diff) | |
| parent | a75f8710242b833046d6df473908d6b198601267 (diff) | |
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.11
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/io.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h index 263cacb2c7fe..491e9d1fc538 100644 --- a/include/asm-ia64/io.h +++ b/include/asm-ia64/io.h @@ -447,14 +447,9 @@ iounmap (volatile void __iomem *addr) /* * String version of IO memory access ops: */ -extern void __ia64_memcpy_fromio (void *, volatile void __iomem *, long); -extern void __ia64_memcpy_toio (volatile void __iomem *, void *, long); -extern void __ia64_memset_c_io (volatile void __iomem *, unsigned long, long); - -#define memcpy_fromio(to,from,len) __ia64_memcpy_fromio((to), (from),(len)) -#define memcpy_toio(to,from,len) __ia64_memcpy_toio((to),(from),(len)) -#define memset_io(addr,c,len) __ia64_memset_c_io((addr), 0x0101010101010101UL*(u8)(c), \ - (len)) +extern void memcpy_fromio(void *dst, const volatile void __iomem *src, long n); +extern void memcpy_toio(volatile void __iomem *dst, const void *src, long n); +extern void memset_io(volatile void __iomem *s, int c, long n); #define dma_cache_inv(_start,_size) do { } while (0) #define dma_cache_wback(_start,_size) do { } while (0) |