kernel: update 3.14 to 3.14.18

[openwrt/staging/yousong.git] / target / linux / ipq806x / patches / 0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch

diff --git a/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch b/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch
index 013d45cc41748e264be6af80955110a7effcb621..b0cefc21530e8ecfdd34025f09d5770aa8c4a2bd 100644 (file)
--- a/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch
+++ b/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch
@@ -15,8 +15,6 @@ Signed-off-by: Olof Johansson <olof@lixom.net>
  arch/arm/boot/dts/qcom-msm8974.dtsi |    5 +++++
  2 files changed, 11 insertions(+)
 
-diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
-index ecfba72..997b7b9 100644
 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi
 +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
 @@ -39,6 +39,12 @@
@@ -32,8 +30,6 @@ index ecfba72..997b7b9 100644
        intc: interrupt-controller@2000000 {
                compatible = "qcom,msm-qgic2";
                interrupt-controller;
-diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
-index 011eb09..f687239 100644
 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
 +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
 @@ -52,6 +52,11 @@
@@ -48,6 +44,3 @@ index 011eb09..f687239 100644
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
--- 
-1.7.10.4
-