Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f363341bc15e6c604e78f4aebf61d7c285ce1cdb..adebd963278e0d075799b70a99982bff83db085b 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -285,10 +285,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.
@@ -463,7 +464,7 @@ config PC87413_WDT
          module will be called pc87413_wdt.
 
          Most people will say N.
- 
+
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on X86
@@ -695,9 +696,17 @@ config 8xx_WDT
        tristate "MPC8xx Watchdog Timer"
        depends on 8xx
 
-config 83xx_WDT
-       tristate "MPC83xx Watchdog Timer"
-       depends on PPC_83xx
+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
+
+         For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.
 
 config MV64X60_WDT
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"