diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:24:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:24:13 +0000 |
| commit | 56fc181f20196a0baa22154fd55bbccc870e709d (patch) | |
| tree | 4f317d1f4de3bbec467b59bec12303115fe08497 /target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch | |
| parent | 98e0d6316579fa6ec653208f640baf8411f91a6c (diff) | |
| download | upstream-56fc181f20196a0baa22154fd55bbccc870e709d.tar.gz upstream-56fc181f20196a0baa22154fd55bbccc870e709d.tar.bz2 upstream-56fc181f20196a0baa22154fd55bbccc870e709d.zip | |
[kernel] refresh generic 2.6.22 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11186 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch index d141b6347b..acca6821ac 100644 --- a/target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch +++ b/target/linux/generic-2.6/patches-2.6.22/002-lzma_decompress.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.21.1.old/include/linux/LzmaDecode.h linux-2.6.21.1.dev/include/linux/LzmaDecode.h ---- linux-2.6.21.1.old/include/linux/LzmaDecode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/include/linux/LzmaDecode.h 2007-05-26 19:03:45.705682584 +0200 +Index: linux-2.6.22.19/include/linux/LzmaDecode.h +=================================================================== +--- /dev/null ++++ linux-2.6.22.19/include/linux/LzmaDecode.h @@ -0,0 +1,100 @@ +/* + LzmaDecode.h @@ -102,9 +103,10 @@ diff -urN linux-2.6.21.1.old/include/linux/LzmaDecode.h linux-2.6.21.1.dev/inclu + UInt32 *outSizeProcessed); + +#endif -diff -urN linux-2.6.21.1.old/lib/LzmaDecode.c linux-2.6.21.1.dev/lib/LzmaDecode.c ---- linux-2.6.21.1.old/lib/LzmaDecode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1.dev/lib/LzmaDecode.c 2007-05-26 19:03:45.706682432 +0200 +Index: linux-2.6.22.19/lib/LzmaDecode.c +=================================================================== +--- /dev/null ++++ linux-2.6.22.19/lib/LzmaDecode.c @@ -0,0 +1,663 @@ +/* + LzmaDecode.c @@ -769,10 +771,11 @@ diff -urN linux-2.6.21.1.old/lib/LzmaDecode.c linux-2.6.21.1.dev/lib/LzmaDecode. + *outSizeProcessed = nowPos; + return LZMA_RESULT_OK; +} -diff -urN linux-2.6.21.1.old/lib/Makefile linux-2.6.21.1.dev/lib/Makefile ---- linux-2.6.21.1.old/lib/Makefile 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.dev/lib/Makefile 2007-05-26 19:03:45.721680152 +0200 -@@ -13,7 +13,7 @@ +Index: linux-2.6.22.19/lib/Makefile +=================================================================== +--- linux-2.6.22.19.orig/lib/Makefile ++++ linux-2.6.22.19/lib/Makefile +@@ -13,7 +13,7 @@ lib-$(CONFIG_SMP) += cpumask.o lib-y += kobject.o kref.o kobject_uevent.o klist.o obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \ @@ -781,7 +784,7 @@ diff -urN linux-2.6.21.1.old/lib/Makefile linux-2.6.21.1.dev/lib/Makefile ifeq ($(CONFIG_DEBUG_KOBJECT),y) CFLAGS_kobject.o += -DDEBUG -@@ -58,6 +58,7 @@ +@@ -58,6 +58,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o obj-$(CONFIG_SWIOTLB) += swiotlb.o |