diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-14 11:22:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-14 11:22:09 +0100 |
| commit | 3c729b4344456ebd520636563c854090e3dec611 (patch) | |
| tree | 6caae9f4d4c9f9ae2e033d64486649c6f603a209 /arch/s390/boot/compressed/misc.c | |
| parent | 90438c4bf987a653ad8679a4fa25a909f0c642b5 (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | linux-stable-3c729b4344456ebd520636563c854090e3dec611.tar.gz linux-stable-3c729b4344456ebd520636563c854090e3dec611.tar.bz2 linux-stable-3c729b4344456ebd520636563c854090e3dec611.zip | |
Merge tag 'v3.11-rc5' into spi-s3c64xx
Linux 3.11-rc5
Diffstat (limited to 'arch/s390/boot/compressed/misc.c')
| -rw-r--r-- | arch/s390/boot/compressed/misc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c index c4c6a1cf221b..57cbaff1f397 100644 --- 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 |