diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
commit | 9157f620436a8383b13c30c0a26ad06b976b1a0b (patch) | |
tree | 768c585c31df15ffc89cd03480ce4558ea291ca0 /target/linux/gemini/patches-3.18/160-gemini-timers.patch | |
parent | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (diff) | |
download | master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.gz master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.bz2 master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.zip |
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 <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45711 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/gemini/patches-3.18/160-gemini-timers.patch')
-rw-r--r-- | target/linux/gemini/patches-3.18/160-gemini-timers.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/gemini/patches-3.18/160-gemini-timers.patch b/target/linux/gemini/patches-3.18/160-gemini-timers.patch index 06251356d2..4b0edb45d1 100644 --- a/target/linux/gemini/patches-3.18/160-gemini-timers.patch +++ b/target/linux/gemini/patches-3.18/160-gemini-timers.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/mach-gemini/time.c 2015-03-25 23:06:03.188317455 +0200 -+++ b/arch/arm/mach-gemini/time.c 2015-03-25 23:06:24.417315486 +0200 +--- a/arch/arm/mach-gemini/time.c ++++ b/arch/arm/mach-gemini/time.c @@ -15,15 +15,18 @@ #include <asm/mach/time.h> #include <linux/clockchips.h> @@ -76,7 +76,7 @@ return 0; } -@@ -66,48 +80,68 @@ +@@ -66,48 +80,68 @@ static void gemini_timer_set_mode(enum c u32 cr; switch (mode) { @@ -176,7 +176,7 @@ { struct clock_event_device *evt = &gemini_clockevent; -@@ -116,14 +150,11 @@ +@@ -116,14 +150,11 @@ static irqreturn_t gemini_timer_interrup } static struct irqaction gemini_timer_irq = { @@ -194,7 +194,7 @@ void __init gemini_timer_init(void) { u32 reg_v; -@@ -151,20 +182,35 @@ +@@ -151,20 +182,35 @@ void __init gemini_timer_init(void) } /* |