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/cns3xxx/patches-3.18/031-pcie_init.patch | 2 +- target/linux/cns3xxx/patches-3.18/090-timers.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/cns3xxx') diff --git a/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch b/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch index 28c3570775..3c739c559a 100644 --- a/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch +++ b/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-cns3xxx/laguna.c +++ b/arch/arm/mach-cns3xxx/laguna.c -@@ -849,7 +849,6 @@ static struct map_desc laguna_io_desc[] +@@ -849,7 +849,6 @@ static struct map_desc laguna_io_desc[] static void __init laguna_map_io(void) { cns3xxx_map_io(); diff --git a/target/linux/cns3xxx/patches-3.18/090-timers.patch b/target/linux/cns3xxx/patches-3.18/090-timers.patch index 2bddc1f67b..a884021384 100644 --- a/target/linux/cns3xxx/patches-3.18/090-timers.patch +++ b/target/linux/cns3xxx/patches-3.18/090-timers.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c -@@ -135,12 +135,13 @@ static void cns3xxx_timer_set_mode(enum +@@ -135,12 +135,13 @@ static void cns3xxx_timer_set_mode(enum switch (mode) { case CLOCK_EVT_MODE_PERIODIC: -- cgit v1.2.3