summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-14 22:55:04 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-14 22:55:04 +0000
commit399f89c7fcc4a05513cb85f97aadc28c08fcc42c (patch)
tree45180e9cf8c2fe6e6823b764b4916df1d3189dd3 /target/linux
parente20c35f54d809b82724732c8dc3020e9d8840231 (diff)
[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
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.2/006-arm_kernel_xz_support.patch4
1 files changed, 3 insertions, 1 deletions
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
+