diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 15:46:18 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 15:46:18 -0500 |
| commit | 3fa04ecd72780da31ba8b329e148179bc24a9c7d (patch) | |
| tree | f5d462fd4aee086952d18f159f737c450ab46b3b /include/net/ipcomp.h | |
| parent | 180b62a3d837613fcac3ce89576526423926c3c3 (diff) | |
| parent | 1cda707d52e51a6cafac0aef12d2bd7052d572e6 (diff) | |
Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
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; |