Selaa lähdekoodia

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 18 vuotta sitten
vanhempi
commit
0bdd0f385a
2 muutettua tiedostoa jossa 9 lisäystä ja 0 poistoa
  1. 8 0
      Documentation/feature-removal-schedule.txt
  2. 1 0
      drivers/char/watchdog/Kconfig

+ 8 - 0
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>
+
+---------------------------

+ 1 - 0
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)