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 | c4bc1f1ae3a8daf8be9c243bd6f154f675d00c01 (patch) | |
| tree | 45180e9cf8c2fe6e6823b764b4916df1d3189dd3 | |
| parent | a3072557cb9ebc9ded1aa214bca10aa02433685e (diff) | |
| download | upstream-c4bc1f1ae3a8daf8be9c243bd6f154f675d00c01.tar.gz upstream-c4bc1f1ae3a8daf8be9c243bd6f154f675d00c01.tar.bz2 upstream-c4bc1f1ae3a8daf8be9c243bd6f154f675d00c01.zip | |
[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
| -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 + |