diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-19 02:25:08 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-19 02:25:08 +0200 |
| commit | 6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch) | |
| tree | c5cd6113ed93854b1bc30cd471c366f080c4be2f /arch/x86/lib/csum-wrappers_64.c | |
| parent | Input: xpad - fix rumble on Xbox One controllers with 2015 firmware (diff) | |
| parent | Input: add HDMI CEC specific keycodes (diff) | |
| download | linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.tar.xz linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.zip | |
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.
Diffstat (limited to 'arch/x86/lib/csum-wrappers_64.c')
| -rw-r--r-- | arch/x86/lib/csum-wrappers_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c index 1318f75d56e4..28a6654f0d08 100644 --- a/arch/x86/lib/csum-wrappers_64.c +++ b/arch/x86/lib/csum-wrappers_64.c @@ -135,7 +135,7 @@ EXPORT_SYMBOL(csum_partial_copy_nocheck); __sum16 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, - __u32 len, unsigned short proto, __wsum sum) + __u32 len, __u8 proto, __wsum sum) { __u64 rest, sum64; |