diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /net/dccp/ccids/ccid2.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
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" |