diff --git a/[refs] b/[refs]
index a1da456181f4..145b4c12b577 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4384247b6910df91049f8d0bbd5c1075898ac290
+refs/heads/master: 73f66ace34e3d935d1ad01208234f8871ac1f500
diff --git a/trunk/include/asm-ia64/checksum.h b/trunk/include/asm-ia64/checksum.h
index 2b78582cbd61..97af155057e4 100644
--- a/trunk/include/asm-ia64/checksum.h
+++ b/trunk/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 */