ralink: fix pci reset patch

sorry, forgot to make target/update before commiting the last patch

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43374 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-11-24 20:39:48 +00:00
parent b3fd443967
commit 638693f5e2
1 changed files with 11 additions and 3 deletions

View File

@ -1,8 +1,16 @@
Index: linux-3.14.18/arch/mips/ralink/reset.c 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.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 +++ linux-3.14.18/arch/mips/ralink/reset.c 2014-11-23 02:55:41.492326840 +0100
@@ -18,8 +18,10 @@ @@ -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> #include <asm/mach-ralink/ralink_regs.h>
/* Reset Control */ /* 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, static int ralink_assert_device(struct reset_controller_dev *rcdev,
unsigned long id) unsigned long id)
@@ -83,6 +85,11 @@ @@ -83,6 +86,11 @@
static void ralink_restart(char *command) static void ralink_restart(char *command)
{ {