Merge tag 'xtensa-for-next-20140221-1' into for_next

[~andy/linux] / lib / inflate.c

diff --git a/lib/inflate.c b/lib/inflate.c
index 677b738c220458827f2765525739021b9219770d..013a7619348125b1a9d4de74546d927acf2616c1 100644 (file)
--- a/lib/inflate.c
+++ b/lib/inflate.c
@@ -103,7 +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 #";