diff options
| author | Jesper Nilsson | 2007-11-15 02:00:47 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-11-15 03:45:44 +0100 |
| commit | b956947106c788a3f2ce0375af930b4cbf7454d5 (patch) | |
| tree | 6aa89716ff4fbb5b91677bce9d157abaff7938a7 /include/asm-cris | |
| parent | aic94xx_sds: rename FLASH_SIZE (diff) | |
| download | kernel-qcow2-linux-b956947106c788a3f2ce0375af930b4cbf7454d5.tar.gz kernel-qcow2-linux-b956947106c788a3f2ce0375af930b4cbf7454d5.tar.xz kernel-qcow2-linux-b956947106c788a3f2ce0375af930b4cbf7454d5.zip | |
cris build fixes: fix csum_tcpudp_magic() declaration
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>
Diffstat (limited to 'include/asm-cris')
| -rw-r--r-- | 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 180dbf2757b0..c6c5be62c698 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) |