diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2012-01-14 22:55:04 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2012-01-14 22:55:04 +0000 |
| commit | 6274648199fba88b077677029858d6d14737a415 (patch) | |
| tree | 48537eab2a94518ab5f5aca4a4789484d5060b59 | |
| parent | e65195c2463e4f10ee0a5a66262c1571f4d7670b (diff) | |
| download | upstream-6274648199fba88b077677029858d6d14737a415.tar.gz upstream-6274648199fba88b077677029858d6d14737a415.tar.bz2 upstream-6274648199fba88b077677029858d6d14737a415.zip | |
fixup arm xz support with recent changes
SVN-Revision: 29750
| -rw-r--r-- | target/linux/generic/patches-3.2/006-arm_kernel_xz_support.patch | 4 |
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 + |