mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 04:42:12 +00:00
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
This commit is contained in:
commit
0bdd0f385a
@ -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>
|
||||
|
||||
---------------------------
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user