aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-03-11 08:59:47 -0400
committerWim Van Sebroeck <wim@iguana.be>2007-03-11 08:59:47 -0400
commitab97e6cf7be77d1a9ae48d1d0eafde0de21805fc (patch)
tree1cf77e32e1d176572a9d8cbd2896fbc084782d2b
parentbe521466feb3bb1cd89de82a2b1d080e9ebd3cb6 (diff)
[WATCHDOG] i8xx TCO driver - mark for removal
Mark the i8xx TCO driver for removal. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--Documentation/feature-removal-schedule.txt8
-rw-r--r--drivers/char/watchdog/Kconfig1
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c3b1430cf603..0bc8b0b2e103 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -316,3 +316,11 @@ Why: The option/code is
316Who: Johannes Berg <johannes@sipsolutions.net> 316Who: Johannes Berg <johannes@sipsolutions.net>
317 317
318--------------------------- 318---------------------------
319
320What: i8xx_tco watchdog driver
321When: in 2.6.22
322Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt
323 watchdog driver.
324Who: Wim Van Sebroeck <wim@iguana.be>
325
326---------------------------
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index ea09d0c974ea..e812aa129e28 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -301,6 +301,7 @@ config I6300ESB_WDT
301config I8XX_TCO 301config I8XX_TCO
302 tristate "Intel i8xx TCO Timer/Watchdog" 302 tristate "Intel i8xx TCO Timer/Watchdog"
303 depends on WATCHDOG && (X86 || IA64) && PCI 303 depends on WATCHDOG && (X86 || IA64) && PCI
304 default n
304 ---help--- 305 ---help---
305 Hardware driver for the TCO timer built into the Intel 82801 306 Hardware driver for the TCO timer built into the Intel 82801
306 I/O Controller Hub family. The TCO (Total Cost of Ownership) 307 I/O Controller Hub family. The TCO (Total Cost of Ownership)