kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / ipq806x / patches / 0025-pinctrl-msm-drop-wake_irqs-bitmap.patch

diff --git a/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch b/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch
index fba5e4f9e32f193dbf474be43738553e72f49c3c..d0771ff27e2870280a445b4bf8138d0bde785369 100644 (file)
--- a/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch
+++ b/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch
@@ -22,8 +22,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  drivers/pinctrl/pinctrl-msm.c |   14 +-------------
  1 file changed, 1 insertion(+), 13 deletions(-)
 
-diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
-index ef2bf31..0e43fdd 100644
 --- a/drivers/pinctrl/pinctrl-msm.c
 +++ b/drivers/pinctrl/pinctrl-msm.c
 @@ -50,7 +50,6 @@
@@ -42,7 +40,7 @@ index ef2bf31..0e43fdd 100644
  
        const struct msm_pinctrl_soc_data *soc;
        void __iomem *regs;
-@@ -783,22 +781,12 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
+@@ -783,22 +781,12 @@ static int msm_gpio_irq_set_wake(struct
  {
        struct msm_pinctrl *pctrl;
        unsigned long flags;
@@ -66,6 +64,3 @@ index ef2bf31..0e43fdd 100644
  
        spin_unlock_irqrestore(&pctrl->lock, flags);
  
--- 
-1.7.10.4
-