Merge commit 'v2.6.38-rc1' into kbuild/packaging

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/inflate.c b/lib/inflate.c
index d10255973a9f..013a76193481 100644
--- a/lib/inflate.c
+++ b/lib/inflate.c
@@ -103,6 +103,9 @@
       the two sets of lengths.
  */
 #include <linux/compiler.h>
+#ifdef NO_INFLATE_MALLOC
+#include <linux/slab.h>
+#endif
 
 #ifdef RCSID
 static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #";