summaryrefslogtreecommitdiff
path: root/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch')
-rw-r--r--target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch b/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch
index 3b3947c..4ea90dc 100644
--- a/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch
+++ b/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch
@@ -1,7 +1,5 @@
-Index: linux-3.13.7/drivers/reset/core.c
-===================================================================
---- linux-3.13.7.orig/drivers/reset/core.c
-+++ linux-3.13.7/drivers/reset/core.c
+--- a/drivers/reset/core.c
++++ b/drivers/reset/core.c
@@ -127,15 +127,16 @@ int reset_control_deassert(struct reset_
EXPORT_SYMBOL_GPL(reset_control_deassert);
@@ -75,10 +73,8 @@ Index: linux-3.13.7/drivers/reset/core.c
EXPORT_SYMBOL_GPL(reset_control_get);
/**
-Index: linux-3.13.7/include/linux/reset.h
-===================================================================
---- linux-3.13.7.orig/include/linux/reset.h
-+++ linux-3.13.7/include/linux/reset.h
+--- a/include/linux/reset.h
++++ b/include/linux/reset.h
@@ -1,6 +1,8 @@
#ifndef _LINUX_RESET_H_
#define _LINUX_RESET_H_