From: Yoichi Yuasa arch/mips/lib/csum_partial_copy.c:21: error: conflicting types for `csum_partial_copy_nocheck' include/asm/checksum.h:65: error: previous declaration of `csum_partial_copy_nocheck' arch/mips/lib/csum_partial_copy.c:38: error: conflicting types for `csum_partial_copy_from_user' include/asm/checksum.h:38: error: previous declaration of `csum_partial_copy_from_user' make[1]: *** [arch/mips/lib/csum_partial_copy.o] Error 1 make: *** [arch/mips/lib] Error 2 Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton --- 25-akpm/arch/mips/lib/csum_partial_copy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/mips/lib/csum_partial_copy.c~mips-fixed-conflicting-types arch/mips/lib/csum_partial_copy.c --- 25/arch/mips/lib/csum_partial_copy.c~mips-fixed-conflicting-types 2005-01-22 18:54:29.054594232 -0800 +++ 25-akpm/arch/mips/lib/csum_partial_copy.c 2005-01-22 18:54:29.057593776 -0800 @@ -16,7 +16,7 @@ /* * copy while checksumming, otherwise like csum_partial */ -unsigned int csum_partial_copy_nocheck(const char *src, char *dst, +unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, int len, unsigned int sum) { /* @@ -33,7 +33,7 @@ unsigned int csum_partial_copy_nocheck(c * Copy from userspace and compute checksum. If we catch an exception * then zero the rest of the buffer. */ -unsigned int csum_partial_copy_from_user (const char *src, char *dst, +unsigned int csum_partial_copy_from_user (const unsigned char *src, unsigned char *dst, int len, unsigned int sum, int *err_ptr) { int missing; _