diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 11:02:56 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 11:02:56 -0700 |
| commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
| tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /arch/blackfin/include/asm/checksum.h | |
| parent | 0bb11e969f5367dcb661f9fcc77efd5d58a2c470 (diff) | |
| parent | 6a5029e66404462a3322dba8e35615bd09332081 (diff) | |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'arch/blackfin/include/asm/checksum.h')
| -rw-r--r-- | arch/blackfin/include/asm/checksum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/checksum.h b/arch/blackfin/include/asm/checksum.h index 623cc7fb00bc..e7134bf94e3c 100644 --- a/arch/blackfin/include/asm/checksum.h +++ b/arch/blackfin/include/asm/checksum.h @@ -14,8 +14,8 @@ */ static inline __wsum -__csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, - unsigned short proto, __wsum sum) +__csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, + __u8 proto, __wsum sum) { unsigned int carry; |