This patch had fixed following 2 conflicting type errors.
Yoichi
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 <[email protected]>
diff -urN -X dontdiff a-orig/arch/mips/lib/csum_partial_copy.c a/arch/mips/lib/csum_partial_copy.c
--- a-orig/arch/mips/lib/csum_partial_copy.c Wed Jan 12 13:02:09 2005
+++ a/arch/mips/lib/csum_partial_copy.c Fri Jan 21 07:47:35 2005
@@ -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 @@
* 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;