Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index ccb78f66c2b6c3a24c509bb62f6341347152ec4f..32b9fe1536413c28e52526a1d3949214a923100d 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -463,7 +463,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 +695,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"
@@ -788,8 +796,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
 
 #