From e5441232a81d01e2ed46d88e340a30fd6b15b012 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Wed, 10 Sep 2014 21:40:19 +0000 Subject: kernel: update 3.14 to 3.14.18 Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch') diff --git a/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch b/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch index 57979ef0ce..3f18c50d88 100644 --- a/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch +++ b/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch @@ -11,11 +11,9 @@ Signed-off-by: Carlo Caione arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 2 files changed, 16 insertions(+) -diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi -index 8441733..74d2920 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi -@@ -421,6 +421,14 @@ +@@ -370,6 +370,14 @@ interrupts = <1 9 0xf04>; }; @@ -30,8 +28,6 @@ index 8441733..74d2920 100644 cpucfg@01f01c00 { compatible = "allwinner,sun6i-a31-cpuconfig"; reg = <0x01f01c00 0x300>; -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index 4981f5e..2e66c85 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -401,6 +401,14 @@ @@ -49,6 +45,3 @@ index 4981f5e..2e66c85 100644 spi0: spi@01c05000 { compatible = "allwinner,sun4i-a10-spi"; reg = <0x01c05000 0x1000>; --- -2.0.3 - -- cgit v1.2.3