aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.14/999-pci-reset.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch)
treec76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/ramips/patches-3.14/999-pci-reset.patch
parent3951f9492f31b59602a9a7c46fbb041be0929be0 (diff)
downloadupstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
Diffstat (limited to 'target/linux/ramips/patches-3.14/999-pci-reset.patch')
-rw-r--r--target/linux/ramips/patches-3.14/999-pci-reset.patch8
1 files changed, 3 insertions, 5 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 f3d49694c2..6055731822 100644
--- a/target/linux/ramips/patches-3.14/999-pci-reset.patch
+++ b/target/linux/ramips/patches-3.14/999-pci-reset.patch
@@ -1,7 +1,5 @@
-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 02:55:41.492326840 +0100
+--- a/arch/mips/ralink/reset.c
++++ b/arch/mips/ralink/reset.c
@@ -11,6 +11,7 @@
#include <linux/pm.h>
#include <linux/io.h>
@@ -23,7 +21,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 +86,11 @@
+@@ -83,6 +86,11 @@ void ralink_rst_init(void)
static void ralink_restart(char *command)
{