[WATCHDOG] i6300esb.c: Restructure initialization of the device

[safe/jmp/linux-2.6] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 09a3d55..6302414 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -406,7 +406,7 @@ config ITCO_WDT
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller
-         Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB
+         Hub family (from ICH0 up to ICH10) and in the Intel 63xxESB
          controller hub.
 
          The TCO (Total Cost of Ownership) timer is a watchdog timer
@@ -772,7 +772,7 @@ config TXX9_WDT
 
 config GEF_WDT
        tristate "GE Fanuc Watchdog Timer"
-       depends on GEF_SBC610
+       depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
        ---help---
          Watchdog timer found in a number of GE Fanuc single board computers.
 
@@ -940,21 +940,6 @@ config WDT
          To compile this driver as a module, choose M here: the
          module will be called wdt.
 
-config WDT_501
-       bool "WDT501 features"
-       depends on WDT
-       help
-         Saying Y here and creating a character special file /dev/temperature
-         with major number 10 and minor number 131 ("man mknod") will give
-         you a thermometer inside your computer: reading from
-         /dev/temperature yields one byte, the temperature in degrees
-         Fahrenheit. This works only if you have a WDT501P watchdog board
-         installed.
-
-         If you want to enable the Fan Tachometer on the WDT501P, then you
-         can do this via the tachometer parameter. Only do this if you have a
-         fan tachometer actually set up.
-
 #
 # PCI-based Watchdog Cards
 #