diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/net/ipcomp.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/net/ipcomp.h')
| -rw-r--r-- | include/net/ipcomp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h index 2a1092abaa07..cc4f30cd7315 100644 --- a/include/net/ipcomp.h +++ b/include/net/ipcomp.h | |||
| @@ -9,7 +9,7 @@ struct crypto_comp; | |||
| 9 | 9 | ||
| 10 | struct ipcomp_data { | 10 | struct ipcomp_data { |
| 11 | u16 threshold; | 11 | u16 threshold; |
| 12 | struct crypto_comp **tfms; | 12 | struct crypto_comp * __percpu *tfms; |
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | struct ip_comp_hdr; | 15 | struct ip_comp_hdr; |