kernel: update 3.14 to 3.14.18

[openwrt.git] / target / linux / ipq806x / patches / 0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch

diff --git a/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch b/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch
index 5fed041..05279de 100644 (file)
--- a/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch
+++ b/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch
@@ -12,8 +12,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org>
  arch/arm/boot/dts/qcom-ipq8064.dtsi      |    8 +++++---
  2 files changed, 16 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
-index 2b2d63c..c54a3ee 100644
 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
 @@ -44,6 +44,10 @@
@@ -56,8 +54,6 @@ index 2b2d63c..c54a3ee 100644
                sata-phy@1b400000 {
                        status = "ok";
                };
-diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-index 97e4c3d..f74e923 100644
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 @@ -421,19 +421,21 @@
@@ -85,6 +81,3 @@ index 97e4c3d..f74e923 100644
                };
  
                nand@0x1ac00000 {
--- 
-1.7.10.4
-