aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu/checksum.h
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-09-12 15:45:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-12 15:45:04 -0400
commitd58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch)
treed9a7e35eb88fea6265d5aadcc3d4ed39122b052a /include/asm-m68knommu/checksum.h
parent877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff)
parent2ade81473636b33aaac64495f89a7dc572c529f0 (diff)
Merge ../torvalds-2.6/
Diffstat (limited to 'include/asm-m68knommu/checksum.h')
-rw-r--r--include/asm-m68knommu/checksum.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-m68knommu/checksum.h b/include/asm-m68knommu/checksum.h
index 92cf102c2534..294ec7583ac9 100644
--- a/include/asm-m68knommu/checksum.h
+++ b/include/asm-m68knommu/checksum.h
@@ -25,7 +25,8 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
25 * better 64-bit) boundary 25 * better 64-bit) boundary
26 */ 26 */
27 27
28unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum); 28unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst,
29 int len, int sum);
29 30
30 31
31/* 32/*
@@ -35,8 +36,8 @@ unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum);
35 * better 64-bit) boundary 36 * better 64-bit) boundary
36 */ 37 */
37 38
38extern unsigned int csum_partial_copy_from_user(const char *src, char *dst, 39extern unsigned int csum_partial_copy_from_user(const unsigned char *src,
39 int len, int sum, int *csum_err); 40 unsigned char *dst, int len, int sum, int *csum_err);
40 41
41#define csum_partial_copy_nocheck(src, dst, len, sum) \ 42#define csum_partial_copy_nocheck(src, dst, len, sum) \
42 csum_partial_copy((src), (dst), (len), (sum)) 43 csum_partial_copy((src), (dst), (len), (sum))