From 76d079204df113afa9e382a43abb5e1a2135150d Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 May 2015 19:32:46 +0000 Subject: kernel: update 3.18 to 3.18.14 Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski SVN-Revision: 45711 --- target/linux/au1000/patches/003-au1000_eth_ioctl.patch | 2 +- target/linux/au1000/patches/006-codec.patch | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'target/linux/au1000') diff --git a/target/linux/au1000/patches/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches/003-au1000_eth_ioctl.patch index 78dae580fd..58927f590d 100644 --- a/target/linux/au1000/patches/003-au1000_eth_ioctl.patch +++ b/target/linux/au1000/patches/003-au1000_eth_ioctl.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/amd/au1000_eth.c +++ b/drivers/net/ethernet/amd/au1000_eth.c -@@ -988,10 +988,14 @@ static void au1000_multicast_list(struct +@@ -1113,10 +1113,14 @@ static void au1000_multicast_list(struct writel(reg, &aup->mac->control); } diff --git a/target/linux/au1000/patches/006-codec.patch b/target/linux/au1000/patches/006-codec.patch index 54f4fa9d30..d80cf56ac9 100644 --- a/target/linux/au1000/patches/006-codec.patch +++ b/target/linux/au1000/patches/006-codec.patch @@ -1,8 +1,6 @@ -Index: linux-3.18.8/arch/mips/alchemy/devboards/db1300.c -=================================================================== ---- linux-3.18.8.orig/arch/mips/alchemy/devboards/db1300.c 2015-02-27 02:49:36.000000000 +0100 -+++ linux-3.18.8/arch/mips/alchemy/devboards/db1300.c 2015-03-10 11:36:47.906310432 +0100 -@@ -712,6 +712,7 @@ +--- a/arch/mips/alchemy/devboards/db1300.c ++++ b/arch/mips/alchemy/devboards/db1300.c +@@ -712,6 +712,7 @@ static struct platform_device db1300_lcd /**********************************************************************/ @@ -10,7 +8,7 @@ Index: linux-3.18.8/arch/mips/alchemy/devboards/db1300.c static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable) { if (enable) -@@ -744,6 +745,15 @@ +@@ -744,6 +745,15 @@ static int db1300_wm97xx_probe(struct pl return wm97xx_register_mach_ops(wm, &db1300_wm97xx_ops); } -- cgit v1.2.3