VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / char / watchdog / Kconfig

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index c2b2dec..a9dec9e 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -95,13 +95,25 @@ 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 SA1100_WATCHDOG
-       tristate "SA1100 watchdog"
-       depends on WATCHDOG && ARCH_SA1100
+       tristate "SA1100/PXA2xx watchdog"
+       depends on WATCHDOG && ( ARCH_SA1100 || ARCH_PXA )
        help
-         Watchdog timer embedded into SA11x0 chips. This will reboot your
-         system when timeout is reached.
-         NOTE, that once enabled, this timer cannot be disabled.
+         Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
+         reboot your system when timeout is reached.
+
+         NOTE: once enabled, this timer cannot be disabled.
 
          To compile this driver as a module, choose M here: the
          module will be called sa1100_wdt.