Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 37bddc1802de3904085c300ad62427cb6263c533..52dff40ec192caeea2042f07cb09021914c52c36 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -15,8 +15,8 @@ menuconfig WATCHDOG
          implementation entirely in software (which can sometimes fail to
          reboot the machine) and a driver for hardware watchdog boards, which
          are more robust and can also keep track of the temperature inside
          implementation entirely in software (which can sometimes fail to
          reboot the machine) and a driver for hardware watchdog boards, which
          are more robust and can also keep track of the temperature inside

-         your computer. For details, read <file:Documentation/watchdog/watchdog.txt>
-         in the kernel source.
+         your computer. For details, read
+         <file:Documentation/watchdog/watchdog-api.txt> in the kernel source.

 
          The watchdog is usually used together with the watchdog daemon
          which is available from
 
          The watchdog is usually used together with the watchdog daemon
          which is available from


@@ -343,11 +343,12 @@ config IBMASR
          module will be called ibmasr.
 
 config WAFER_WDT
          module will be called ibmasr.
 
 config WAFER_WDT

-       tristate "ICP Wafer 5823 Single Board Computer Watchdog"
+       tristate "ICP Single Board Computer Watchdog Timer"

        depends on X86
        help
        depends on X86
        help

-         This is a driver for the hardware watchdog on the ICP Wafer 5823
-         Single Board Computer (and probably other similar models).
+         This is a driver for the hardware watchdog on the ICP Single
+         Board Computer. This driver is working on (at least) the following
+         IPC SBC's: Wafer 5823, Rocky 4783, Rocky 3703 and Rocky 3782.

 
          To compile this driver as a module, choose M here: the
          module will be called wafer5823wdt.
 
          To compile this driver as a module, choose M here: the
          module will be called wafer5823wdt.


@@ -391,6 +392,16 @@ config ITCO_VENDOR_SUPPORT
          devices. At this moment we only have additional support for some
          SuperMicro Inc. motherboards.
 
          devices. At this moment we only have additional support for some
          SuperMicro Inc. motherboards.
 

+config IT8712F_WDT
+       tristate "IT8712F (Smart Guardian) Watchdog Timer"
+       depends on X86
+       ---help---
+         This is the driver for the built-in watchdog timer on the IT8712F
+         Super I/0 chipset used on many motherboards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called it8712f_wdt.
+

 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86


@@ -455,6 +466,19 @@ config SBC8360_WDT
 
          Most people will say N.
 
 
          Most people will say N.
 

+config SBC7240_WDT
+       tristate "SBC Nano 7240 Watchdog Timer"
+       depends on X86_32
+       ---help---
+         This is the driver for the hardware watchdog found on the IEI
+         single board computers EPIC Nano 7240 (and likely others). This
+         watchdog simply watches your kernel to make sure it doesn't freeze,
+         and if it does, it reboots your computer after a certain amount of
+         time.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sbc7240_wdt.
+

 config CPU5_WDT
        tristate "SMA CPU5 Watchdog"
        depends on X86
 config CPU5_WDT
        tristate "SMA CPU5 Watchdog"
        depends on X86


@@ -609,6 +633,12 @@ config WDT_RM9K_GPI
          To compile this driver as a module, choose M here: the
          module will be called rm9k_wdt.
 
          To compile this driver as a module, choose M here: the
          module will be called rm9k_wdt.
 

+config AR7_WDT
+       tristate "TI AR7 Watchdog Timer"
+       depends on AR7
+       help
+         Hardware driver for the TI AR7 Watchdog Timer.
+

 # PARISC Architecture
 
 # POWERPC Architecture
 # PARISC Architecture
 
 # POWERPC Architecture