diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 17:39:33 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 17:39:33 +0100 |
commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
tree | 50c101806f4d3b6585222dda060559eb4f3e005a /include/asm-m68k/checksum.h | |
parent | Merge branch 'master' of /usr/src/ntfs-2.6/ (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
download | linux-944d79559d154c12becde0dab327016cf438f46c.tar.xz linux-944d79559d154c12becde0dab327016cf438f46c.zip |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-m68k/checksum.h')
-rw-r--r-- | include/asm-m68k/checksum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/checksum.h b/include/asm-m68k/checksum.h index 78860c20db01..17280ef719f5 100644 --- a/include/asm-m68k/checksum.h +++ b/include/asm-m68k/checksum.h @@ -25,7 +25,7 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum) * better 64-bit) boundary */ -extern unsigned int csum_partial_copy_from_user(const unsigned char *src, +extern unsigned int csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst, int len, int sum, int *csum_err); |