diff options
-rw-r--r-- | arch/mn10300/boot/compressed/misc.c | 1 | ||||
-rw-r--r-- | lib/inflate.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/mn10300/boot/compressed/misc.c b/arch/mn10300/boot/compressed/misc.c index f673383518e4..42cbd77bd439 100644 --- a/arch/mn10300/boot/compressed/misc.c +++ b/arch/mn10300/boot/compressed/misc.c | |||
@@ -167,6 +167,7 @@ static uch *high_buffer_start /* = (uch *)(((ulg)&end) + HEAP_SIZE)*/; | |||
167 | static char *vidmem = (char *)0xb8000; | 167 | static char *vidmem = (char *)0xb8000; |
168 | static int lines, cols; | 168 | static int lines, cols; |
169 | 169 | ||
170 | #define BOOTLOADER_INFLATE | ||
170 | #include "../../../../lib/inflate.c" | 171 | #include "../../../../lib/inflate.c" |
171 | 172 | ||
172 | static inline void scroll(void) | 173 | static inline void scroll(void) |
diff --git a/lib/inflate.c b/lib/inflate.c index 677b738c2204..013a76193481 100644 --- a/lib/inflate.c +++ b/lib/inflate.c | |||
@@ -103,7 +103,9 @@ | |||
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 | #ifdef NO_INFLATE_MALLOC | ||
106 | #include <linux/slab.h> | 107 | #include <linux/slab.h> |
108 | #endif | ||
107 | 109 | ||
108 | #ifdef RCSID | 110 | #ifdef RCSID |
109 | static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #"; | 111 | static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #"; |