From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 27 Oct 2010 10:02:03 +0000 (+0000)
Subject: refresh 2.6.35 patches
X-Git-Tag: reboot~18591
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cfe4c4a10606fca674beecdf9307975a9b007179;p=openwrt%2Fstaging%2Fblogic.git

refresh 2.6.35 patches

SVN-Revision: 23651
---

diff --git a/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch b/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch
index 482923dfd29c..37e322ad8ca6 100644
--- a/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch
+++ b/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.35.7/include/linux/decompress/unlzo_mm.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.7/include/linux/decompress/unlzo_mm.h	2010-10-23 09:32:04.000000000 +0800
+--- /dev/null
++++ b/include/linux/decompress/unlzo_mm.h
 @@ -0,0 +1,10 @@
 +#ifndef UNLZO_MM_H
 +#define UNLZO_MM_H
@@ -13,10 +11,8 @@ Index: linux-2.6.35.7/include/linux/decompress/unlzo_mm.h
 +#endif
 +
 +#endif
-Index: linux-2.6.35.7/lib/decompress_unlzo.c
-===================================================================
---- linux-2.6.35.7.orig/lib/decompress_unlzo.c	2010-10-23 09:29:09.000000000 +0800
-+++ linux-2.6.35.7/lib/decompress_unlzo.c	2010-10-23 09:32:53.000000000 +0800
+--- a/lib/decompress_unlzo.c
++++ b/lib/decompress_unlzo.c
 @@ -39,6 +39,7 @@
  
  #include <linux/types.h>
diff --git a/target/linux/generic/patches-2.6.35/980-vm_exports.patch b/target/linux/generic/patches-2.6.35/980-vm_exports.patch
index 73a221af87cf..8a021e24c70a 100644
--- a/target/linux/generic/patches-2.6.35/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.35/980-vm_exports.patch
@@ -122,7 +122,7 @@
  				void *caller)
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -732,6 +732,7 @@ extern void show_free_areas(void);
+@@ -736,6 +736,7 @@ extern void show_free_areas(void);
  
  int shmem_lock(struct file *file, int lock, struct user_struct *user);
  struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);