diff --git a/[refs] b/[refs] index 66f7f37db933..52498c4e11ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42ae766fffdad89267151acddaf936df58ab2267 +refs/heads/master: df28f34bf998795c4d4e08c1604eac0a6d84f502 diff --git a/trunk/include/asm-m68knommu/checksum.h b/trunk/include/asm-m68knommu/checksum.h index 92cf102c2534..294ec7583ac9 100644 --- a/trunk/include/asm-m68knommu/checksum.h +++ b/trunk/include/asm-m68knommu/checksum.h @@ -25,7 +25,8 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum) * better 64-bit) boundary */ -unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum); +unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, + int len, int sum); /* @@ -35,8 +36,8 @@ unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum); * better 64-bit) boundary */ -extern unsigned int csum_partial_copy_from_user(const char *src, char *dst, - int len, int sum, int *csum_err); +extern unsigned int csum_partial_copy_from_user(const unsigned char *src, + unsigned char *dst, int len, int sum, int *csum_err); #define csum_partial_copy_nocheck(src, dst, len, sum) \ csum_partial_copy((src), (dst), (len), (sum))