git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
s390
/
boot
/
compressed
/
misc.c
diff --git
a/arch/s390/boot/compressed/misc.c
b/arch/s390/boot/compressed/misc.c
index
14e0479
..
0851eb1
100644
(file)
--- a/
arch/s390/boot/compressed/misc.c
+++ b/
arch/s390/boot/compressed/misc.c
@@
-50,6
+50,10
@@
static unsigned long free_mem_end_ptr;
#include "../../../../lib/decompress_unlzma.c"
#endif
+#ifdef CONFIG_KERNEL_LZO
+#include "../../../../lib/decompress_unlzo.c"
+#endif
+
extern _sclp_print_early(const char *);
int puts(const char *s)