refresh generic 2.6.21 patches

[openwrt/openwrt.git] / target / linux / generic-2.6 / patches / 002-lzma_decompress.patch

diff --git a/target/linux/generic-2.6/patches/002-lzma_decompress.patch b/target/linux/generic-2.6/patches/002-lzma_decompress.patch
index 3f15feba38a33b9f2d5ff8df3c4d612c908f00fe..e4a00692f2bfa29abc9cf66a6c4c03ee0ea45226 100644 (file)
--- a/target/linux/generic-2.6/patches/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches/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.21.7/include/linux/LzmaDecode.h
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/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.21.7/lib/LzmaDecode.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/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
-@@ -12,7 +12,7 @@
+Index: linux-2.6.21.7/lib/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/lib/Makefile
++++ linux-2.6.21.7/lib/Makefile
+@@ -12,7 +12,7 @@ lib-$(CONFIG_SMP) += cpumask.o
  
  lib-y += kobject.o kref.o kobject_uevent.o klist.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
-@@ -56,6 +56,7 @@
+@@ -56,6 +56,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o
  obj-$(CONFIG_AUDIT_GENERIC) += audit.o
  
  obj-$(CONFIG_SWIOTLB) += swiotlb.o