The patch titled
cris build fixes: fix csum_tcpudp_magic() declaration
has been removed from the -mm tree. Its filename was
cris-build-fixes-fix-csum_tcpudp_magic-declaration.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: cris build fixes: fix csum_tcpudp_magic() declaration
From: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
Remove int from prototype, no longer needed and causes compile error.
Signed-off-by: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
Acked-by: Mikael Starvik <starvik@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-cris/checksum.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/asm-cris/checksum.h~cris-build-fixes-fix-csum_tcpudp_magic-declaration include/asm-cris/checksum.h
--- a/include/asm-cris/checksum.h~cris-build-fixes-fix-csum_tcpudp_magic-declaration
+++ a/include/asm-cris/checksum.h
@@ -62,7 +62,7 @@ static inline __sum16 ip_fast_csum(const
* 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)
_
Patches currently in -mm which might be from jesper.nilsson@xxxxxxxx are
origin.patch
cris-build-fixes-atomich-needs-compilerh.patch
git-mtd.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
