]> err.no Git - linux-2.6/commitdiff
cris build fixes: fix csum_tcpudp_magic() declaration
authorJesper Nilsson <jesper.nilsson@axis.com>
Thu, 15 Nov 2007 01:00:47 +0000 (17:00 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 15 Nov 2007 02:45:44 +0000 (18:45 -0800)
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>
include/asm-cris/checksum.h

index 180dbf2757b0a87c8ec0ec2ad7a1481ee3f5a5ea..c6c5be62c6981aadf552a1d8dadf54b4a3012d1c 100644 (file)
@@ -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)