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_unlzma.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_unlzma.c')
| -rw-r--r-- | lib/decompress_unlzma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index 546f2f4c157e..32123a1340e6 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #endif /* STATIC */ | 34 | #endif /* STATIC */ |
| 35 | 35 | ||
| 36 | #include <linux/decompress/mm.h> | 36 | #include <linux/decompress/mm.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #define MIN(a, b) (((a) < (b)) ? (a) : (b)) | 39 | #define MIN(a, b) (((a) < (b)) ? (a) : (b)) |
| 39 | 40 | ||