X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fipq806x%2Fpatches%2F0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch;h=f0bd614cfdcffea3ad95242a1ac33c6973ed35d2;hb=02629d8f87303a03e3ac36f48c508242d9b8cb09;hp=c141a0b6c0baedd0ac14cf9a42699a5b85e5ec94;hpb=7be0ed78e7cf578aa89996d408703ea2ab79a1e8;p=openwrt%2Fopenwrt.git 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 c141a0b6c0..f0bd614cfd 100644 --- 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 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 -@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, +@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pin *mask = 7; break; case PIN_CONFIG_OUTPUT: @@ -33,6 +31,3 @@ index 19d2feb..343f421 100644 *bit = g->oe_bit; *mask = 1; break; --- -1.7.10.4 -