From: kaloz Date: Sat, 14 Jan 2012 22:55:04 +0000 (+0000) Subject: [generic/3.2]: fixup arm xz support with recent changes X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=399f89c7fcc4a05513cb85f97aadc28c08fcc42c;p=openwrt.git [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 --- 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 @$(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 +