tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 0bdd0f38 69300436

+9
unified split
+8
Documentation/feature-removal-schedule.txt
··· 316 Who: Johannes Berg <johannes@sipsolutions.net> 317 318 ---------------------------
··· 316 Who: Johannes Berg <johannes@sipsolutions.net> 317 318 --------------------------- 319 + 320 + What: i8xx_tco watchdog driver 321 + When: in 2.6.22 322 + Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt 323 + watchdog driver. 324 + Who: Wim Van Sebroeck <wim@iguana.be> 325 + 326 + ---------------------------
+1
drivers/char/watchdog/Kconfig
··· 301 config I8XX_TCO 302 tristate "Intel i8xx TCO Timer/Watchdog" 303 depends on WATCHDOG && (X86 || IA64) && PCI 304 ---help--- 305 Hardware driver for the TCO timer built into the Intel 82801 306 I/O Controller Hub family. The TCO (Total Cost of Ownership)
··· 301 config I8XX_TCO 302 tristate "Intel i8xx TCO Timer/Watchdog" 303 depends on WATCHDOG && (X86 || IA64) && PCI 304 + default n 305 ---help--- 306 Hardware driver for the TCO timer built into the Intel 82801 307 I/O Controller Hub family. The TCO (Total Cost of Ownership)