aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-03-14 14:22:10 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-03-18 10:02:51 +0100
commita8cfef6c4584b1cf3e334c6d43a850b86d536d7d (patch)
tree347af5247bd62f2ea00b837a3a832ca7f8390155 /target/linux/oxnas
parent79fc997e4875e1f1e48289ea719094e079745540 (diff)
downloadupstream-a8cfef6c4584b1cf3e334c6d43a850b86d536d7d.tar.gz
upstream-a8cfef6c4584b1cf3e334c6d43a850b86d536d7d.tar.bz2
upstream-a8cfef6c4584b1cf3e334c6d43a850b86d536d7d.zip
kernel: bump 4.14 to 4.14.106
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch b/target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch
index 669a901683..4cc622b19e 100644
--- a/target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch
+++ b/target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch
@@ -1,8 +1,6 @@
-diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c
-index eed6feff8b5f..30c6f4ce672b 100644
--- a/drivers/clocksource/timer-oxnas-rps.c
+++ b/drivers/clocksource/timer-oxnas-rps.c
-@@ -296,4 +296,4 @@ static int __init oxnas_rps_timer_init(struct device_node *np)
+@@ -296,4 +296,4 @@ err_alloc:
TIMER_OF_DECLARE(ox810se_rps,
"oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);
TIMER_OF_DECLARE(ox820_rps,