[generic/3.2]: fixup arm xz support with recent changes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29750 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-01-14 22:55:04 +00:00 · 2012-01-14 22:55:04 +00:00 · c4bc1f1ae3
parent a3072557cb
commit c4bc1f1ae3
1 changed files with 3 additions and 1 deletions
--- a/target/linux/generic/patches-3.2/006-arm_kernel_xz_support.patch
+++ b/target/linux/generic/patches-3.2/006-arm_kernel_xz_support.patch
@ -62,11 +62,13 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 	@$(check_for_bad_syms)
 --- a/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"
 #endif
 
 +#ifdef CONFIG_KERNEL_XZ
+#define memmove memmove
+#define memcpy memcpy
 +#include "../../../../lib/decompress_unxz.c"
 +#endif
 +