Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

1 files changed, 77 insertions, 11 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index ccb78f66c2b6..1a22fe782a27 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -66,6 +66,13 @@ config AT91RM9200_WATCHDOG
           Watchdog timer embedded into AT91RM9200 chips. This will reboot your
           system when the timeout is reached.
 
+config AT91SAM9X_WATCHDOG
+        tristate "AT91SAM9X watchdog"
+        depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261)
+        help
+          Watchdog timer embedded into AT91SAM9X chips. This will reboot your
+          system when the timeout is reached.
+
 config 21285_WATCHDOG
         tristate "DC21285 watchdog"
         depends on FOOTBRIDGE
@@ -217,6 +224,15 @@ config DAVINCI_WATCHDOG
           NOTE: once enabled, this timer cannot be disabled.
           Say N if you are unsure.
 
+config ORION5X_WATCHDOG
+        tristate "Orion5x watchdog"
+        depends on ARCH_ORION5X
+        help
+          Say Y here if to include support for the watchdog timer
+          in the Orion5x ARM SoCs.
+          To compile this driver as a module, choose M here: the
+          module will be called orion5x_wdt.
+
 # ARM26 Architecture
 
 # AVR32 Architecture
@@ -285,10 +301,11 @@ config ALIM1535_WDT
 
 config ALIM7101_WDT
         tristate "ALi M7101 PMU Computer Watchdog"
-        depends on X86 && PCI
+        depends on PCI
         help
           This is the driver for the hardware watchdog on the ALi M7101 PMU
-          as used in the x86 Cobalt servers.
+          as used in the x86 Cobalt servers and also found in some
+          SPARC Netra servers too.
 
           To compile this driver as a module, choose M here: the
           module will be called alim7101_wdt.
@@ -415,6 +432,18 @@ config IT8712F_WDT
           To compile this driver as a module, choose M here: the
           module will be called it8712f_wdt.
 
+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.
+
+          To compile this driver as a module, choose M here: the module will
+          be called it87_wdt.
+
 config HP_WATCHDOG
         tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
         depends on X86
@@ -463,7 +492,17 @@ config PC87413_WDT
           module will be called pc87413_wdt.
 
           Most people will say N.
- 
+
+config RDC321X_WDT
+        tristate "RDC R-321x SoC watchdog"
+        depends on X86_RDC321X
+        help
+          This is the driver for the built in hardware watchdog
+          in the RDC R-321x SoC.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rdc321x_wdt.
+
 config 60XX_WDT
         tristate "SBC-60XX Watchdog Timer"
         depends on X86
@@ -562,6 +601,21 @@ config W83697HF_WDT
 
           Most people will say N.
 
+config W83697UG_WDT
+        tristate "W83697UG/W83697UF Watchdog Timer"
+        depends on X86
+        ---help---
+          This is the driver for the hardware watchdog on the W83697UG/UF
+          chipset as used in MSI Fuzzy CX700 VIA motherboards (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 w83697ug_wdt.
+
+          Most people will say N.
+
 config W83877F_WDT
         tristate "W83877F (EMACS) Watchdog Timer"
         depends on X86
@@ -632,6 +686,16 @@ config SBC_EPX_C3_WATCHDOG
 
 # MIPS Architecture
 
+config RC32434_WDT
+        tristate "IDT RC32434 SoC Watchdog Timer"
+        depends on MIKROTIK_RB532
+        help
+          Hardware driver for the IDT RC32434 SoC built-in
+          watchdog timer.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rc32434_wdt.
+
 config INDYDOG
         tristate "Indy/I2 Hardware Watchdog"
         depends on SGI_HAS_INDYDOG
@@ -691,13 +755,17 @@ config MPC5200_WDT
         tristate "MPC5200 Watchdog Timer"
         depends on PPC_MPC52xx
 
-config 8xx_WDT
-        tristate "MPC8xx Watchdog Timer"
-        depends on 8xx
+config 8xxx_WDT
+        tristate "MPC8xxx Platform Watchdog Timer"
+        depends on PPC_8xx || PPC_83xx || PPC_86xx
+        help
+          This driver is for a SoC level watchdog that exists on some
+          Freescale PowerPC processors. So far this driver supports:
+          - MPC8xx watchdogs
+          - MPC83xx watchdogs
+          - MPC86xx watchdogs
 
-config 83xx_WDT
-        tristate "MPC83xx Watchdog Timer"
-        depends on PPC_83xx
+          For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.
 
 config MV64X60_WDT
         tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
@@ -788,8 +856,6 @@ config WATCHDOG_RIO
           machines.  The watchdog timeout period is normally one minute but
           can be changed with a boot-time parameter.
 
-# V850 Architecture
-
 # XTENSA Architecture
 
 #