Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index da0741da712a305ba59f205338230666d0154d36..2792bc1a726991b7b3dbf0046ad1e2d2dd6b313b 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
-         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
@@ -610,6 +610,12 @@ config WDT_RM9K_GPI
          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