[WATCHDOG] i8xx TCO driver - mark for removal

Mark the i8xx TCO driver for removal.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c3b1430cf603eafd2b51c2e43af55aec79a0fd40..0bc8b0b2e103421cc7062e01d642b91cd0dc3abd 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -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>
+
+---------------------------

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index ea09d0c974ea41a442b8233ad17f0e6303acb2ea..e812aa129e289540c5edae8c9ffb83da5f1e8ad0 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -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)