[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/generic-2.6/patches-2.6.21/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.21/002-lzma_decompress.patch
index e4a0069..5d4e83f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.21/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches-2.6.21/002-lzma_decompress.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/include/linux/LzmaDecode.h
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.21.7/include/linux/LzmaDecode.h
++++ b/include/linux/LzmaDecode.h

 @@ -0,0 +1,100 @@
 +/*
 +  LzmaDecode.h
 @@ -0,0 +1,100 @@
 +/*
 +  LzmaDecode.h


@@ -103,10 +101,8 @@ Index: linux-2.6.21.7/include/linux/LzmaDecode.h
 +    UInt32 *outSizeProcessed);
 +
 +#endif
 +    UInt32 *outSizeProcessed);
 +
 +#endif

-Index: linux-2.6.21.7/lib/LzmaDecode.c
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.21.7/lib/LzmaDecode.c
++++ b/lib/LzmaDecode.c

 @@ -0,0 +1,663 @@
 +/*
 +  LzmaDecode.c
 @@ -0,0 +1,663 @@
 +/*
 +  LzmaDecode.c


@@ -771,10 +767,8 @@ Index: linux-2.6.21.7/lib/LzmaDecode.c
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}

-Index: linux-2.6.21.7/lib/Makefile
-===================================================================
---- linux-2.6.21.7.orig/lib/Makefile
-+++ linux-2.6.21.7/lib/Makefile
+--- a/lib/Makefile
++++ b/lib/Makefile

 @@ -12,7 +12,7 @@ lib-$(CONFIG_SMP) += cpumask.o
  
  lib-y += kobject.o kref.o kobject_uevent.o klist.o
 @@ -12,7 +12,7 @@ lib-$(CONFIG_SMP) += cpumask.o
  
  lib-y += kobject.o kref.o kobject_uevent.o klist.o