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

Commit 0bdd0f38 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] i8xx TCO driver - mark for removal
parents 69300436 ab97e6cf

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -316,3 +316,11 @@ Why: The option/code is 
Who:	Johannes Berg <johannes@sipsolutions.net>



---------------------------



What:	i8xx_tco watchdog driver

When:	in 2.6.22

Why:	the i8xx_tco watchdog driver has been replaced by the iTCO_wdt

	watchdog driver.

Who:	Wim Van Sebroeck <wim@iguana.be>



---------------------------

drivers/char/watchdog/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ config I6300ESB_WDT 
config I8XX_TCO

	tristate "Intel i8xx TCO Timer/Watchdog"

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

	default n

	---help---

	  Hardware driver for the TCO timer built into the Intel 82801

	  I/O Controller Hub family.  The TCO (Total Cost of Ownership)