diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:02:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:02:57 -0400 |
| commit | ff96e612cba32510e263e17b213235fe5746397e (patch) | |
| tree | a8df57d76b10e0901a4fb76cd2987eb9826a560a /lib/decompress_inflate.c | |
| parent | cd84a42f315e50edd454c27a3da3951ccd3d735a (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into core/urgent
Merge reason: need latest upstream to queue up dependent fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/decompress_inflate.c')
| -rw-r--r-- | lib/decompress_inflate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c index 839a329b4fc4..e36b296fc9f8 100644 --- a/lib/decompress_inflate.c +++ b/lib/decompress_inflate.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #endif /* STATIC */ | 23 | #endif /* STATIC */ |
| 24 | 24 | ||
| 25 | #include <linux/decompress/mm.h> | 25 | #include <linux/decompress/mm.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #define INBUF_LEN (16*1024) | 28 | #define INBUF_LEN (16*1024) |
| 28 | 29 | ||