kernel: update 3.14 to 3.14.18

[openwrt.git] / target / linux / ipq806x / patches / 0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch

diff --git a/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch b/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch
index ba25b46..7c1cb29 100644 (file)
--- a/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch
+++ b/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch
@@ -14,8 +14,6 @@ Signed-off-by: Kevin Hilman <khilman@linaro.org>
  arch/arm/configs/multi_v7_defconfig |   10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
-index ee69829..1a61bd8 100644
 --- a/arch/arm/configs/multi_v7_defconfig
 +++ b/arch/arm/configs/multi_v7_defconfig
 @@ -31,6 +31,10 @@ CONFIG_SOC_OMAP5=y
@@ -49,6 +47,3 @@ index ee69829..1a61bd8 100644
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_MEMORY=y
--- 
-1.7.10.4
-