make all 3.6 patches apply and build

SVN-Revision: 33911

1 files changed, 5 insertions, 5 deletions

diff --git a/target/linux/generic/patches-3.6/941-ocf_20120127.patch b/target/linux/generic/patches-3.6/941-ocf_20120127.patch
index 794627a..3c24fe4 100644
--- a/target/linux/generic/patches-3.6/941-ocf_20120127.patch
+++ b/target/linux/generic/patches-3.6/941-ocf_20120127.patch
@@ -1,8 +1,8 @@
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
-@@ -131,6 +131,9 @@
-  *	void add_interrupt_randomness(int irq, int irq_flags);
-  * 	void add_disk_randomness(struct gendisk *disk);
+@@ -139,6 +139,9 @@
+  * that might otherwise be identical and have very little entropy
+  * available to them (particularly common in the embedded world).
   *
 + *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
 + *      int random_input_wait(void);
@@ -24,7 +24,7 @@
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.
-@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk
+@@ -799,6 +809,63 @@ void add_disk_randomness(struct gendisk
  }
  #endif
  
@@ -90,7 +90,7 @@
   * Entropy extraction routines
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
+@@ -143,6 +143,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
  	}
  	return ret;
  }