Merge with ../linux-2.6

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

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index fa789ea36bbe3169490c02204e9e6209cd860eb9..f3d8d275e951b7521a2acaa4ef8b6851d6320945 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -572,4 +572,11 @@ config USBPCWATCHDOG
 
          Most people will say N.
 
+config OMAP16XX_WATCHDOG
+       tristate "OMAP1610/OMAP1710 Watchdog"
+       depends on WATCHDOG && ARCH_OMAP16XX
+       help
+         Support for TI OMAP1610/OMAP1710 watchdog. Say 'Y' here to enable the
+         OMAP1610/OMAP1710 watchdog timer.
+
 endmenu