diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-05-17 18:41:26 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-05-18 09:10:46 +0200 |
| commit | e2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73 (patch) | |
| tree | 01d46d7549a9554ff8a659993b97b3d07f5e59f1 /target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch | |
| parent | 12f44b83a8db2c95274839e2e41792e096021f29 (diff) | |
| download | upstream-e2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73.tar.gz upstream-e2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73.tar.bz2 upstream-e2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73.zip | |
kernel: bump 4.14 to 4.14.41
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.patch | 7 |
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 - |