aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-18 20:25:45 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-18 20:25:45 +0000
commite582f614b6e15517a9207b0a96a72b68f7a254df (patch)
treea5424c2b64deca27b19672364f80d83e46892d23 /target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
parent37044cf01e5764164d34a4bfe14f9f00f7a2f6ea (diff)
downloadupstream-e582f614b6e15517a9207b0a96a72b68f7a254df.tar.gz
upstream-e582f614b6e15517a9207b0a96a72b68f7a254df.tar.bz2
upstream-e582f614b6e15517a9207b0a96a72b68f7a254df.zip
refresh generic 2.6.24 patches
SVN-Revision: 11188
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
index 9e75936f0f..bb41b2df59 100644
--- a/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23/include/linux/LzmaDecode.h
+Index: linux-2.6.24.7/include/linux/LzmaDecode.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/include/linux/LzmaDecode.h 2007-10-10 13:51:27.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/LzmaDecode.h
@@ -0,0 +1,100 @@
+/*
+ LzmaDecode.h
@@ -103,10 +103,10 @@ Index: linux-2.6.23/include/linux/LzmaDecode.h
+ UInt32 *outSizeProcessed);
+
+#endif
-Index: linux-2.6.23/lib/LzmaDecode.c
+Index: linux-2.6.24.7/lib/LzmaDecode.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/lib/LzmaDecode.c 2007-10-10 13:51:27.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/lib/LzmaDecode.c
@@ -0,0 +1,663 @@
+/*
+ LzmaDecode.c
@@ -771,12 +771,12 @@ Index: linux-2.6.23/lib/LzmaDecode.c
+ *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK;
+}
-Index: linux-2.6.23/lib/Makefile
+Index: linux-2.6.24.7/lib/Makefile
===================================================================
---- linux-2.6.23.orig/lib/Makefile 2007-10-10 13:50:24.000000000 +0800
-+++ linux-2.6.23/lib/Makefile 2007-10-10 13:51:53.000000000 +0800
-@@ -13,7 +13,7 @@
- lib-y += kobject.o kref.o kobject_uevent.o klist.o
+--- linux-2.6.24.7.orig/lib/Makefile
++++ linux-2.6.24.7/lib/Makefile
+@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
+ lib-y += kobject.o kref.o klist.o
obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
- bust_spinlocks.o hexdump.o kasprintf.o bitmap.o
@@ -784,7 +784,7 @@ Index: linux-2.6.23/lib/Makefile
ifeq ($(CONFIG_DEBUG_KOBJECT),y)
CFLAGS_kobject.o += -DDEBUG
-@@ -62,6 +62,7 @@
+@@ -64,6 +64,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
obj-$(CONFIG_SWIOTLB) += swiotlb.o