summaryrefslogtreecommitdiffstats
path: root/arch/ppc/lib
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
committer <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
commit19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch)
tree40b1cb534496a7f1ca0f5c314a523c69f1fee464 /arch/ppc/lib
parent7206675c40394c78a90e74812bbdbf8cf3cca1be (diff)
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'arch/ppc/lib')
-rw-r--r--arch/ppc/lib/Makefile1
-rw-r--r--arch/ppc/lib/checksum.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/lib/Makefile b/arch/ppc/lib/Makefile
index d94420c4a..baace0862 100644
--- a/arch/ppc/lib/Makefile
+++ b/arch/ppc/lib/Makefile
@@ -4,6 +4,7 @@
L_TARGET = lib.o
L_OBJS = checksum.o cksum_support.o
+CC = gcc -I$(TOPDIR)/include
${L_TARGET}: $(L_OBJS)
$(LD) -r -o ${L_TARGET} $(L_OBJS)
diff --git a/arch/ppc/lib/checksum.c b/arch/ppc/lib/checksum.c
index 0e0a37ea0..973916f74 100644
--- a/arch/ppc/lib/checksum.c
+++ b/arch/ppc/lib/checksum.c
@@ -127,7 +127,7 @@ csum_tcpudp_magic(unsigned long saddr, unsigned long daddr, unsigned short len,
* Fold a partial checksum without adding pseudo headers
*/
-unsigned short csum_fold(unsigned int sum)
+unsigned int csum_fold(unsigned int sum)
{
sum = (sum & 0xffff) + (sum >> 16);
sum = (sum & 0xffff) + (sum >> 16);