aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-11-24 20:39:48 +0000
committerJohn Crispin <john@openwrt.org>2014-11-24 20:39:48 +0000
commit506cf51b533da43405dd341b29c01bada1211b2b (patch)
tree135a9222a8608f13a26e199077716cf45bbd7e68 /target/linux
parentdb69761f9494ca3ebb7ebb559872809de061d973 (diff)
downloadupstream-506cf51b533da43405dd341b29c01bada1211b2b.tar.gz
upstream-506cf51b533da43405dd341b29c01bada1211b2b.tar.bz2
upstream-506cf51b533da43405dd341b29c01bada1211b2b.zip
ralink: fix pci reset patch
sorry, forgot to make target/update before commiting the last patch Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 43374
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/patches-3.14/999-pci-reset.patch14
1 files changed, 11 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-3.14/999-pci-reset.patch b/target/linux/ramips/patches-3.14/999-pci-reset.patch
index 8e8589015b..f3d49694c2 100644
--- a/target/linux/ramips/patches-3.14/999-pci-reset.patch
+++ b/target/linux/ramips/patches-3.14/999-pci-reset.patch
@@ -1,8 +1,16 @@
Index: linux-3.14.18/arch/mips/ralink/reset.c
===================================================================
--- linux-3.14.18.orig/arch/mips/ralink/reset.c 2014-11-23 00:32:23.268612766 +0100
-+++ linux-3.14.18/arch/mips/ralink/reset.c 2014-11-23 01:13:46.850117349 +0100
-@@ -18,8 +18,10 @@
++++ linux-3.14.18/arch/mips/ralink/reset.c 2014-11-23 02:55:41.492326840 +0100
+@@ -11,6 +11,7 @@
+ #include <linux/pm.h>
+ #include <linux/io.h>
+ #include <linux/of.h>
++#include <linux/delay.h>
+ #include <linux/reset-controller.h>
+
+ #include <asm/reboot.h>
+@@ -18,8 +19,10 @@
#include <asm/mach-ralink/ralink_regs.h>
/* Reset Control */
@@ -15,7 +23,7 @@ Index: linux-3.14.18/arch/mips/ralink/reset.c
static int ralink_assert_device(struct reset_controller_dev *rcdev,
unsigned long id)
-@@ -83,6 +85,11 @@
+@@ -83,6 +86,11 @@
static void ralink_restart(char *command)
{