diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-01-11 16:04:39 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-01-17 11:07:17 +0100 |
| commit | 9e7d53c3fed13d9e2da5f11c4c888efa3cd85312 (patch) | |
| tree | 77f00a58cae3b44847debfe4cf806f6d0d4796c9 /target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch | |
| parent | 7f93624d5f545408333120c2b30e13bf3b97ef0b (diff) | |
| download | upstream-9e7d53c3fed13d9e2da5f11c4c888efa3cd85312.tar.gz upstream-9e7d53c3fed13d9e2da5f11c4c888efa3cd85312.tar.bz2 upstream-9e7d53c3fed13d9e2da5f11c4c888efa3cd85312.zip | |
cns3xxx: refresh patches
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch')
| -rw-r--r-- | target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch b/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch index 4f9f3e6465..6dd0ef0fef 100644 --- a/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch +++ b/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch @@ -4,7 +4,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -324,6 +324,13 @@ config KS8695_WATCHDOG +@@ -355,6 +355,13 @@ config KS8695_WATCHDOG Watchdog timer embedded into KS8695 processor. This will reboot your system when the timeout is reached. @@ -20,8 +20,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> help --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -47,6 +47,7 @@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.o - obj-$(CONFIG_977_WATCHDOG) += wdt977.o +@@ -49,6 +49,7 @@ obj-$(CONFIG_977_WATCHDOG) += wdt977.o + obj-$(CONFIG_GEMINI_WATCHDOG) += gemini_wdt.o obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o +obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o @@ -151,7 +151,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> +MODULE_LICENSE("GPL"); --- a/arch/arm/include/asm/smp_twd.h +++ b/arch/arm/include/asm/smp_twd.h -@@ -33,5 +33,6 @@ struct twd_local_timer name __initdata = +@@ -34,5 +34,6 @@ struct twd_local_timer name __initdata = }; int twd_local_timer_register(struct twd_local_timer *); |