diff options
| author | Thomas Gleixner | 2011-01-31 15:08:43 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2011-01-31 15:09:14 +0100 |
| commit | 51563cd53c4b1c1790fccd2e0af0e2b756589af9 (patch) | |
| tree | d2fedfc654ab4fa011feaca262f95481a89e232a /arch/sh/boot/compressed/misc.c | |
| parent | rwsem: Remove redundant asmregparm annotation (diff) | |
| parent | rtmutex: Simplify PI algorithm and make highest prio task get lock (diff) | |
| download | kernel-qcow2-linux-51563cd53c4b1c1790fccd2e0af0e2b756589af9.tar.gz kernel-qcow2-linux-51563cd53c4b1c1790fccd2e0af0e2b756589af9.tar.xz kernel-qcow2-linux-51563cd53c4b1c1790fccd2e0af0e2b756589af9.zip | |
Merge branch 'tip/rtmutex' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into core/locking
*git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace tip/rtmutex:
rtmutex: Simplify PI algorithm and make highest prio task get lock
Diffstat (limited to 'arch/sh/boot/compressed/misc.c')
| -rw-r--r-- | arch/sh/boot/compressed/misc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index 27140a6b365d..95470a472d2c 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c @@ -61,6 +61,10 @@ static unsigned long free_mem_end_ptr; #include "../../../../lib/decompress_unlzma.c" #endif +#ifdef CONFIG_KERNEL_XZ +#include "../../../../lib/decompress_unxz.c" +#endif + #ifdef CONFIG_KERNEL_LZO #include "../../../../lib/decompress_unlzo.c" #endif |