Commit:     b956947106c788a3f2ce0375af930b4cbf7454d5
Parent:     d297a5d576d549d97dce456ba4bd01e5a47e899c
Author:     Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 14 17:00:47 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Nov 14 18:45:44 2007 -0800

    cris build fixes: fix csum_tcpudp_magic() declaration
    Remove int from prototype, no longer needed and causes compile error.
    Signed-off-by: Jesper Nilsson <[EMAIL PROTECTED]>
    Acked-by: Mikael Starvik <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-cris/checksum.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-cris/checksum.h b/include/asm-cris/checksum.h
index 180dbf2..c6c5be6 100644
--- a/include/asm-cris/checksum.h
+++ b/include/asm-cris/checksum.h
@@ -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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to