diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 06:07:15 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 06:07:15 -0400 |
| commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
| tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /lib/inflate.c | |
| parent | ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'lib/inflate.c')
| -rw-r--r-- | lib/inflate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/inflate.c b/lib/inflate.c index d10255973a9f..677b738c2204 100644 --- a/lib/inflate.c +++ b/lib/inflate.c | |||
| @@ -103,6 +103,7 @@ | |||
| 103 | the two sets of lengths. | 103 | the two sets of lengths. |
| 104 | */ | 104 | */ |
| 105 | #include <linux/compiler.h> | 105 | #include <linux/compiler.h> |
| 106 | #include <linux/slab.h> | ||
| 106 | 107 | ||
| 107 | #ifdef RCSID | 108 | #ifdef RCSID |
| 108 | static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #"; | 109 | static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #"; |