projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
[deliverable/linux.git]
/
arch
/
s390
/
boot
/
compressed
/
misc.c
diff --git
a/arch/s390/boot/compressed/misc.c
b/arch/s390/boot/compressed/misc.c
index c4c6a1cf221bde749673b59dccb6e3c6113a0b4c..57cbaff1f39778b98b1de870e34f99cc14043687 100644
(file)
--- a/
arch/s390/boot/compressed/misc.c
+++ b/
arch/s390/boot/compressed/misc.c
@@
-47,6
+47,10
@@
static unsigned long free_mem_end_ptr;
#include "../../../../lib/decompress_bunzip2.c"
#endif
+#ifdef CONFIG_KERNEL_LZ4
+#include "../../../../lib/decompress_unlz4.c"
+#endif
+
#ifdef CONFIG_KERNEL_LZMA
#include "../../../../lib/decompress_unlzma.c"
#endif
This page took
0.025097 seconds
and
5
git commands to generate.