Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'linux-watchdog-4.16-fixes-1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
- rave-sp: add NVMEM dependency
- build fixes for i6300esb_wdt, xen_wdt and sp5100_tco
* tag 'linux-watchdog-4.16-fixes-1' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: sp5100_tco.c: fix potential build failure
watchdog: xen_wdt: fix potential build failure
watchdog: i6300esb: fix build failure
watchdog: rave-sp: add NVMEM dependency
+4
+4
drivers/watchdog/Kconfig
+4
drivers/watchdog/Kconfig
···
226
226
config RAVE_SP_WATCHDOG
227
227
tristate "RAVE SP Watchdog timer"
228
228
depends on RAVE_SP_CORE
229
+
depends on NVMEM || !NVMEM
229
230
select WATCHDOG_CORE
230
231
help
231
232
Support for the watchdog on RAVE SP device.
···
904
903
config SP5100_TCO
905
904
tristate "AMD/ATI SP5100 TCO Timer/Watchdog"
906
905
depends on X86 && PCI
906
+
select WATCHDOG_CORE
907
907
---help---
908
908
Hardware watchdog driver for the AMD/ATI SP5100 chipset. The TCO
909
909
(Total Cost of Ownership) timer is a watchdog timer that will reboot
···
1010
1008
config I6300ESB_WDT
1011
1009
tristate "Intel 6300ESB Timer/Watchdog"
1012
1010
depends on PCI
1011
+
select WATCHDOG_CORE
1013
1012
---help---
1014
1013
Hardware driver for the watchdog timer built into the Intel
1015
1014
6300ESB controller hub.
···
1840
1837
config XEN_WDT
1841
1838
tristate "Xen Watchdog support"
1842
1839
depends on XEN
1840
+
select WATCHDOG_CORE
1843
1841
help
1844
1842
Say Y here to support the hypervisor watchdog capability provided
1845
1843
by Xen 4.0 and newer. The watchdog timeout period is normally one