From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 23 Jan 2007 12:27:04 +0000 (+0000)
Subject: [PATCH] fix prototype of csum_ipv6_magic() (ia64)
X-Git-Tag: v2.6.20-rc6~19
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=73f66ace34e3d935d1ad01208234f8871ac1f500;p=linux-2.6-omap-h63xx.git

[PATCH] fix prototype of csum_ipv6_magic() (ia64)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-ia64/checksum.h b/include/asm-ia64/checksum.h
index 2b78582cbd6..97af155057e 100644
--- a/include/asm-ia64/checksum.h
+++ b/include/asm-ia64/checksum.h
@@ -72,8 +72,8 @@ static inline __sum16 csum_fold(__wsum csum)
 
 #define _HAVE_ARCH_IPV6_CSUM	1
 struct in6_addr;
-extern unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
-	struct in6_addr *daddr, __u32 len, unsigned short proto,
-	unsigned int csum);
+extern __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
+	const struct in6_addr *daddr, __u32 len, unsigned short proto,
+	__wsum csum);
 
 #endif /* _ASM_IA64_CHECKSUM_H */