aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-05-24 10:08:20 +0200
committerJohn Crispin <john@phrozen.org>2018-05-24 16:04:09 +0200
commite39414ed07e03c8cd1aecd1874acf40d6d8a8d93 (patch)
treec975ce947a053c32467a33a0099c5b979c4b858b /target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
parent2b7289cd3bb19812d91ae8ee1703eee8dcf2f748 (diff)
downloadupstream-e39414ed07e03c8cd1aecd1874acf40d6d8a8d93.tar.gz
upstream-e39414ed07e03c8cd1aecd1874acf40d6d8a8d93.tar.bz2
upstream-e39414ed07e03c8cd1aecd1874acf40d6d8a8d93.zip
kernel: bump 4.14 to 4.14.43 for 18.06
Refreshed all patches Dropped upstreamed patches: 522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch 523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch 525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch 527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch updated patches: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch 030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch Added new ARM64 symbol: CONFIG_ARM64_ERRATUM_1024718 Compile-tested on: cns3xxx, imx6, mvebu (arm64), x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch')
-rw-r--r--target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch b/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
index 8cf4fb3c94..36234d8d83 100644
--- a/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
+++ b/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch
@@ -11,11 +11,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
drivers/watchdog/ath79_wdt.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
-diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
-index e2209bf5fa8a..c2fc6c3d0092 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
-@@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(void)
+@@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(voi
static int ath79_wdt_set_timeout(int val)
{
@@ -32,6 +30,3 @@ index e2209bf5fa8a..c2fc6c3d0092 100644
ath79_wdt_keepalive();
return 0;
---
-2.11.0
-