projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.14 to 3.14.18
[openwrt/openwrt.git]
/
target
/
linux
/
ipq806x
/
patches
/
0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch
diff --git
a/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch
b/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch
index c141a0b6c0baedd0ac14cf9a42699a5b85e5ec94..f0bd614cfdcffea3ad95242a1ac33c6973ed35d2 100644
(file)
--- a/
target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch
+++ b/
target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch
@@
-21,11
+21,9
@@
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-msm.c | 1 -
1 file changed, 1 deletion(-)
drivers/pinctrl/pinctrl-msm.c | 1 -
1 file changed, 1 deletion(-)
-diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
-index 19d2feb..343f421 100644
--- a/drivers/pinctrl/pinctrl-msm.c
+++ b/drivers/pinctrl/pinctrl-msm.c
--- a/drivers/pinctrl/pinctrl-msm.c
+++ b/drivers/pinctrl/pinctrl-msm.c
-@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pin
ctrl *pctrl,
+@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pin
*mask = 7;
break;
case PIN_CONFIG_OUTPUT:
*mask = 7;
break;
case PIN_CONFIG_OUTPUT:
@@
-33,6
+31,3
@@
index 19d2feb..343f421 100644
*bit = g->oe_bit;
*mask = 1;
break;
*bit = g->oe_bit;
*mask = 1;
break;
---
-1.7.10.4
-