aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 16:43:29 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 16:43:29 -0800
commit3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch)
treebaec074db38a5ceaaabbcee76f199acef43bb42a /arch/um
parent0238cb4e7583c521bb3538060f98a73e65f61324 (diff)
parentfb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff)
downloadkernel_samsung_smdk4412-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.zip
kernel_samsung_smdk4412-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.tar.gz
kernel_samsung_smdk4412-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/sysdep-i386/checksum.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/sysdep-i386/checksum.h b/arch/um/include/sysdep-i386/checksum.h
index 764ba4d..7d3d202 100644
--- a/arch/um/include/sysdep-i386/checksum.h
+++ b/arch/um/include/sysdep-i386/checksum.h
@@ -36,7 +36,7 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *
int len, int sum)
{
memcpy(dst, src, len);
- return(csum_partial(dst, len, sum));
+ return csum_partial(dst, len, sum);
}
/*
@@ -104,7 +104,7 @@ static inline unsigned short ip_fast_csum(unsigned char * iph,
: "=r" (sum), "=r" (iph), "=r" (ihl)
: "1" (iph), "2" (ihl)
: "memory");
- return(sum);
+ return sum;
}
/*