update from upstream

1 files changed, 88 insertions, 21 deletions

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index b53e2e2b5aee..344001b45af9 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -84,6 +84,17 @@ config 977_WATCHDOG
 
           Not sure? It's safe to say N.
 
+config IXP2000_WATCHDOG
+        tristate "IXP2000 Watchdog"
+        depends on WATCHDOG && ARCH_IXP2000
+        help
+          Say Y here if to include support for the watchdog timer
+          in the Intel IXP2000(2400, 2800, 2850) network processors.
+          This driver can be built as a module by choosing M. The module
+          will be called ixp2000_wdt.
+
+          Say N if you are unsure.
+
 config IXP4XX_WATCHDOG
         tristate "IXP4xx Watchdog"
         depends on WATCHDOG && ARCH_IXP4XX
@@ -100,17 +111,6 @@ config IXP4XX_WATCHDOG
 
           Say N if you are unsure.
 
-config IXP2000_WATCHDOG
-        tristate "IXP2000 Watchdog"
-        depends on WATCHDOG && ARCH_IXP2000
-        help
-          Say Y here if to include support for the watchdog timer
-          in the Intel IXP2000(2400, 2800, 2850) network processors.
-          This driver can be built as a module by choosing M. The module
-          will be called ixp2000_wdt.
-
-          Say N if you are unsure.
-
 config S3C2410_WATCHDOG
         tristate "S3C2410 Watchdog"
         depends on WATCHDOG && ARCH_S3C2410
@@ -139,6 +139,15 @@ config SA1100_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called sa1100_wdt.
 
+config MPCORE_WATCHDOG
+        tristate "MPcore watchdog"
+        depends on WATCHDOG && ARM_MPCORE_PLATFORM && LOCAL_TIMERS
+        help
+          Watchdog timer embedded into the MPcore system.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mpcore_wdt.
+
 # X86 (i386 + ia64 + x86_64) Architecture
 
 config ACQUIRE_WDT
@@ -224,6 +233,16 @@ config IB700_WDT
 
           Most people will say N.
 
+config IBMASR
+        tristate "IBM Automatic Server Restart"
+        depends on WATCHDOG && X86
+        help
+          This is the driver for the IBM Automatic Server Restart watchdog
+          timer builtin into some eServer xSeries machines.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ibmasr.
+
 config WAFER_WDT
         tristate "ICP Wafer 5823 Single Board Computer Watchdog"
         depends on WATCHDOG && X86
@@ -234,6 +253,16 @@ config WAFER_WDT
           To compile this driver as a module, choose M here: the
           module will be called wafer5823wdt.
 
+config I6300ESB_WDT
+        tristate "Intel 6300ESB Timer/Watchdog"
+        depends on WATCHDOG && X86 && PCI
+        ---help---
+          Hardware driver for the watchdog timer built into the Intel
+          6300ESB controller hub.
+
+          To compile this driver as a module, choose M here: the
+          module will be called i6300esb.
+
 config I8XX_TCO
         tristate "Intel i8xx TCO Timer/Watchdog"
         depends on WATCHDOG && (X86 || IA64) && PCI
@@ -289,6 +318,19 @@ config 60XX_WDT
           You can compile this driver directly into the kernel, or use
           it as a module.  The module will be called sbc60xxwdt.
 
+config SBC8360_WDT
+        tristate "SBC8360 Watchdog Timer"
+        depends on WATCHDOG && X86
+        ---help---
+
+          This is the driver for the hardware watchdog on the SBC8360 Single
+          Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
+
+          To compile this driver as a module, choose M here: the
+          module will be called sbc8360.ko.
+
+          Most people will say N.
+
 config CPU5_WDT
         tristate "SMA CPU5 Watchdog"
         depends on WATCHDOG && X86
@@ -327,6 +369,19 @@ config W83877F_WDT
 
           Most people will say N.
 
+config W83977F_WDT
+        tristate "W83977F (PCM-5335) Watchdog Timer"
+        depends on WATCHDOG && X86
+        ---help---
+          This is the driver for the hardware watchdog on the W83977F I/O chip
+          as used in AAEON's PCM-5335 SBC (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 w83977f_wdt.
+
 config MACHZ_WDT
         tristate "ZF MachZ Watchdog"
         depends on WATCHDOG && X86
@@ -346,6 +401,28 @@ config 8xx_WDT
         tristate "MPC8xx Watchdog Timer"
         depends on WATCHDOG && 8xx
 
+config MV64X60_WDT
+        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
+        depends on WATCHDOG && MV64X60
+
+config BOOKE_WDT
+        tristate "PowerPC Book-E Watchdog Timer"
+        depends on WATCHDOG && (BOOKE || 4xx)
+        ---help---
+          Please see Documentation/watchdog/watchdog-api.txt for
+          more information.
+
+# PPC64 Architecture
+
+config WATCHDOG_RTAS
+        tristate "RTAS watchdog"
+        depends on WATCHDOG && PPC_RTAS
+        help
+          This driver adds watchdog support for the RTAS watchdog.
+
+          To compile this driver as a module, choose M here. The module
+          will be called wdrtas.
+
 # MIPS Architecture
 
 config INDYDOG
@@ -414,16 +491,6 @@ config WATCHDOG_RIO
           machines.  The watchdog timeout period is normally one minute but
           can be changed with a boot-time parameter.
 
-# ppc64 RTAS watchdog
-config WATCHDOG_RTAS
-        tristate "RTAS watchdog"
-        depends on WATCHDOG && PPC_RTAS
-        help
-          This driver adds watchdog support for the RTAS watchdog.
-
-          To compile this driver as a module, choose M here. The module
-          will be called wdrtas.
-
 #
 # ISA-based Watchdog Cards
 #