atheros: merge a few patches into the right place

SVN-Revision: 26556
2011-04-09 18:26:03 +00:00
parent 63c08f0f0b
commit 7486cf730a
6 changed files with 27 additions and 54 deletions
--- a/target/linux/atheros/patches-2.6.37/210-reset_button.patch
+++ b/target/linux/atheros/patches-2.6.37/210-reset_button.patch
@@ -11,7 +11,7 @@
 
 --- /dev/null
 +++ b/arch/mips/ar231x/reset.c
-@@ -0,0 +1,160 @@
+@@ -0,0 +1,161 @@
 +#include <linux/init.h>
 +#include <linux/module.h>
 +#include <linux/timer.h>
@@ -38,7 +38,8 @@
 +static struct timer_list rst_button_timer;
 +static unsigned long seen;
 +
-+extern struct sock *uevent_sock;
+struct sock *uevent_sock = NULL;
+EXPORT_SYMBOL_GPL(uevent_sock);
 +extern u64 uevent_next_seqnum(void);
 +
 +static int no_release_workaround = 1;