Commit b9569471 authored Nov 14, 2007 by Jesper Nilsson Committed by Linus Torvalds Nov 14, 2007

cris build fixes: fix csum_tcpudp_magic() declaration



Remove int from prototype, no longer needed and causes compile error.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent d297a5d5

include/asm-cris/checksum.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)