From: Jesper Nilsson Date: Thu, 15 Nov 2007 01:00:47 +0000 (-0800) Subject: cris build fixes: fix csum_tcpudp_magic() declaration X-Git-Tag: v2.6.24-rc3~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b956947106c788a3f2ce0375af930b4cbf7454d5;p=platform%2Fkernel%2Flinux-stable.git cris build fixes: fix csum_tcpudp_magic() declaration Remove int from prototype, no longer needed and causes compile error. Signed-off-by: Jesper Nilsson Acked-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-cris/checksum.h b/include/asm-cris/checksum.h index 180dbf2..c6c5be6 100644 --- a/include/asm-cris/checksum.h +++ b/include/asm-cris/checksum.h @@ -62,7 +62,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) * returns a 16-bit checksum, already complemented */ -static inline __sum16 int csum_tcpudp_magic(__be32 saddr, __be32 daddr, +static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len, unsigned short proto, __wsum sum)