From: Imre Kaloz <kaloz@openwrt.org>
Date: Sat, 14 Jan 2012 22:55:04 +0000 (+0000)
Subject: fixup arm xz support with recent changes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6274648199fba88b077677029858d6d14737a415;p=openwrt%2Fstaging%2Fblocktrron.git

fixup arm xz support with recent changes

SVN-Revision: 29750
---

diff --git 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
index 42ef57cfee..ac3aae94e3 100644
--- 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
 +