fixup arm xz support with recent changes

SVN-Revision: 29750
This commit is contained in:
Imre Kaloz 2012-01-14 22:55:04 +00:00
parent e65195c246
commit 6274648199

View file

@ -62,11 +62,13 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
@$(check_for_bad_syms) @$(check_for_bad_syms)
--- a/arch/arm/boot/compressed/decompress.c --- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c +++ b/arch/arm/boot/compressed/decompress.c
@@ -44,6 +44,10 @@ extern void error(char *); @@ -44,6 +44,12 @@ extern void error(char *);
#include "../../../../lib/decompress_unlzma.c" #include "../../../../lib/decompress_unlzma.c"
#endif #endif
+#ifdef CONFIG_KERNEL_XZ +#ifdef CONFIG_KERNEL_XZ
+#define memmove memmove
+#define memcpy memcpy
+#include "../../../../lib/decompress_unxz.c" +#include "../../../../lib/decompress_unxz.c"
+#endif +#endif
+ +