kernel: update 3.14 to 3.14.18

[openwrt/staging/stintel.git] / target / linux / ipq806x / patches / 0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch

diff --git a/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch b/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch
index c1c116f0b659af95d47b6181699c3308ab649319..cbccbc2d807dba200cf7e16903e17d9b23019531 100644 (file)
--- a/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch
+++ b/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch
@@ -12,8 +12,6 @@ Acked-by: Linus Walleij <linus.walleij@linaro.org>
  arch/arm/mach-qcom/Kconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
-index a028be2..6440c11 100644
 --- a/arch/arm/mach-qcom/Kconfig
 +++ b/arch/arm/mach-qcom/Kconfig
 @@ -5,6 +5,7 @@ config ARCH_QCOM
@@ -24,6 +22,3 @@ index a028be2..6440c11 100644
        select QCOM_SCM if SMP
        help
          Support for Qualcomm's devicetree based systems.
--- 
-1.7.10.4
-