aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-2.6.37/210-reset_button.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-09 18:26:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-09 18:26:03 +0000
commit7486cf730ac50b1577276f70a470d19115bec32f (patch)
treebb9d76ba9f8ec4365acdbdb30b2436645380581f /target/linux/atheros/patches-2.6.37/210-reset_button.patch
parent63c08f0f0b41e1ab3f453ab811a8b51ae54542c6 (diff)
downloadupstream-7486cf730ac50b1577276f70a470d19115bec32f.tar.gz
upstream-7486cf730ac50b1577276f70a470d19115bec32f.tar.bz2
upstream-7486cf730ac50b1577276f70a470d19115bec32f.zip
atheros: merge a few patches into the right place
SVN-Revision: 26556
Diffstat (limited to 'target/linux/atheros/patches-2.6.37/210-reset_button.patch')
-rw-r--r--target/linux/atheros/patches-2.6.37/210-reset_button.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/atheros/patches-2.6.37/210-reset_button.patch b/target/linux/atheros/patches-2.6.37/210-reset_button.patch
index 3c91818146..7bf9d0e14d 100644
--- 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;