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

Commit 2fee7b18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] iTCO_wdt.c shutdown patch
  [WATCHDOG] iTCO_wdt.c - pci_dev_put fix
  [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
  [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
parents 353cefdb 1bef84be

drivers/char/watchdog/Kconfig

+21 −0
Original line number Diff line number Diff line
@@ -316,6 +316,27 @@ config I8XX_TCO 
	  To compile this driver as a module, choose M here: the

	  module will be called i8xx_tco.



config ITCO_WDT

	tristate "Intel TCO Timer/Watchdog (EXPERIMENTAL)"

	depends on WATCHDOG && (X86 || IA64) && PCI && EXPERIMENTAL

	---help---

	  Hardware driver for the intel TCO timer based watchdog devices.

	  These drivers are included in the Intel 82801 I/O Controller

	  Hub family 'from ICH0 up to ICH7) and in the Intel 6300ESB

	  controller hub.



	  The TCO (Total Cost of Ownership) timer is a watchdog timer

	  that will reboot the machine after its second expiration. The

	  expiration time can be configured with the "heartbeat" parameter.



	  On some motherboards the driver may fail to reset the chipset's

	  NO_REBOOT flag which prevents the watchdog from rebooting the

	  machine. If this is the case you will get a kernel message like

	  "failed to reset NO_REBOOT flag, reboot disabled by hardware".



	  To compile this driver as a module, choose M here: the

	  module will be called iTCO_wdt.



config SC1200_WDT

	tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"

	depends on WATCHDOG && X86

drivers/char/watchdog/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ obj-$(CONFIG_IBMASR) += ibmasr.o 
obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o

obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o

obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o

obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o

obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o

obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o

obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o

drivers/char/watchdog/iTCO_wdt.c

0 → 100644
+735 −0

File added.

Preview size limit exceeded, changes collapsed.