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

diff --combined drivers/char/watchdog/Kconfig
index fa789ea36bbe3169490c02204e9e6209cd860eb9,2d78962b4de7bd66c77fd9f9c8592ee48bba333b..344001b45af94b3caa8ac0cf83979e224bb61e96
--- 1/drivers/char/watchdog/Kconfig
--- 2/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@@ -84,6 -84,17 +84,17 @@@ config 977_WATCHDO
  
          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 +111,6 @@@
  
          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,15 -139,6 +139,15 @@@ config SA1100_WATCHDO
          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
@@@ -233,6 -224,16 +233,16 @@@ config IB700_WD
  
          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
@@@ -243,6 -244,16 +253,16 @@@
          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
@@@ -298,6 -309,19 +318,19 @@@ config 60XX_WD
          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
@@@ -336,6 -360,19 +369,19 @@@ config W83877F_WD
  
          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
@@@ -355,6 -392,10 +401,10 @@@ config 8xx_WD
        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)
@@@ -362,6 -403,17 +412,17 @@@
          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
@@@ -430,16 -482,6 +491,6 @@@ config WATCHDOG_RI
          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
  #

diff --combined drivers/char/watchdog/Makefile
index bc6f5fe88c8c24f200c13a0caf38fc3c02d6344a,3ca8a12a1510252c6ea16e6093c54ff7f9b62d5d..cfd0a39877102224f901856f805562ed4feb1b33
--- 1/drivers/char/watchdog/Makefile
--- 2/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@@ -29,7 -29,6 +29,7 @@@ obj-$(CONFIG_IXP2000_WATCHDOG) += ixp20
  obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
  obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
  obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
 +obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
  
  # X86 (i386 + ia64 + x86_64) Architecture
  obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
@@@ -39,22 -38,27 +39,27 @@@ obj-$(CONFIG_ALIM7101_WDT) += alim7101_
  obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
  obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
  obj-$(CONFIG_IB700_WDT) += ib700wdt.o
+ obj-$(CONFIG_IBMASR) += ibmasr.o
  obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
+ obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
  obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
  obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
  obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
  obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
+ obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
  obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
  obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
  obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
+ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
  obj-$(CONFIG_MACHZ_WDT) += machzwd.o
  
  # PowerPC Architecture
  obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+ obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
+ obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
  
  # PPC64 Architecture
  obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
- obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
  
  # MIPS Architecture
  obj-$(CONFIG_INDYDOG) += indydog.o