Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d0972a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 03a6c259 a17f4f03

drivers/watchdog/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ config ZIIRAVE_WATCHDOG 
config RAVE_SP_WATCHDOG

	tristate "RAVE SP Watchdog timer"

	depends on RAVE_SP_CORE

	depends on NVMEM || !NVMEM

	select WATCHDOG_CORE

	help

	  Support for the watchdog on RAVE SP device.
@@ -903,6 +904,7 @@ config F71808E_WDT 
config SP5100_TCO

	tristate "AMD/ATI SP5100 TCO Timer/Watchdog"

	depends on X86 && PCI

	select WATCHDOG_CORE

	---help---

	  Hardware watchdog driver for the AMD/ATI SP5100 chipset. The TCO

	  (Total Cost of Ownership) timer is a watchdog timer that will reboot
@@ -1008,6 +1010,7 @@ config WAFER_WDT 
config I6300ESB_WDT

	tristate "Intel 6300ESB Timer/Watchdog"

	depends on PCI

	select WATCHDOG_CORE

	---help---

	  Hardware driver for the watchdog timer built into the Intel

	  6300ESB controller hub.
@@ -1837,6 +1840,7 @@ config WATCHDOG_SUN4V 
config XEN_WDT

	tristate "Xen Watchdog support"

	depends on XEN

	select WATCHDOG_CORE

	help

	  Say Y here to support the hypervisor watchdog capability provided

	  by Xen 4.0 and newer.  The watchdog timeout period is normally one