Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: iTCO_wdt.c: remove extra pci_dev_put()'s from init code
  watchdog: add support for Broadcom BCM63xx built-in watchdog
  watchdog: f71808e_wdt: add support for the F71889FG
  watchdog: MachZ: fix debug macro
  watchdog: it8712f_wdt: Add module parameter for alternative reset sources
  watchdog: it8712f_wdt: Add comments for config/control register names
  watchdog: it87_wdt: Add support for watchdogs with 8b timers
  watchdog: it87_wdt: Add support for IT8720F watchdog
  watchdog:  Use static const char * const where possible
  watchdog: iTCO_wdt: Cleanup warning messages
  watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg DeviceIDs

1 files changed, 17 insertions, 6 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index c356146bd712..4a291045ebac 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -409,11 +409,11 @@ config ALIM7101_WDT
           Most people will say N.
 
 config F71808E_WDT
-        tristate "Fintek F71808E and F71882FG Watchdog"
+        tristate "Fintek F71808E, F71882FG and F71889FG Watchdog"
         depends on X86 && EXPERIMENTAL
         help
           This is the driver for the hardware watchdog on the Fintek
-          F71808E and F71882FG Super I/O controllers.
+          F71808E, F71882FG and F71889FG Super I/O controllers.
 
           You can compile this driver directly into the kernel, or use
           it as a module.  The module will be called f71808e_wdt.
@@ -565,10 +565,11 @@ config IT87_WDT
         tristate "IT87 Watchdog Timer"
         depends on X86 && EXPERIMENTAL
         ---help---
-          This is the driver for the hardware watchdog on the ITE IT8716,
-          IT8718, IT8726, IT8712(Version J,K) Super I/O chips. 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.
+          This is the driver for the hardware watchdog on the ITE IT8702,
+          IT8712, IT8716, IT8718, IT8720, IT8726, IT8712 Super I/O chips.
+          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 it87_wdt.
@@ -916,6 +917,16 @@ config OCTEON_WDT
           from the first interrupt, it is then only poked when the
           device is written.
 
+config BCM63XX_WDT
+        tristate "Broadcom BCM63xx hardware watchdog"
+        depends on BCM63XX
+        help
+          Watchdog driver for the built in watchdog hardware in Broadcom
+          BCM63xx SoC.
+
+          To compile this driver as a loadable module, choose M here.
+          The module will be called bcm63xx_wdt.
+
 # PARISC Architecture
 
 # POWERPC Architecture