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 /net/dccp/ccids/ccid2.c | |
| 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 'net/dccp/ccids/ccid2.c')
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index a47a8c918ee8..9b3ae9922be1 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | /* | 23 | /* |
| 24 | * This implementation should follow RFC 4341 | 24 | * This implementation should follow RFC 4341 |
| 25 | */ | 25 | */ |
| 26 | #include <linux/slab.h> | ||
| 26 | #include "../feat.h" | 27 | #include "../feat.h" |
| 27 | #include "../ccid.h" | 28 | #include "../ccid.h" |
| 28 | #include "../dccp.h" | 29 | #include "../dccp.h" |