Merge branch 'linux-3.8.y' into ti-linux-3.8.y

[android-sdk/kernel-video.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 19fa73a0374c2fab7a3d09c8f9808ca7ce813c72..782be4c18cf735783fd8e46188b3dc3e5defc32f 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -103,6 +103,13 @@ config WM8350_WATCHDOG
          Support for the watchdog in the WM8350 AudioPlus PMIC.  When
          the watchdog triggers the system will be reset.
 
+config PALMAS_WATCHDOG
+       tristate "Palmas Watchdog"
+       depends on MFD_PALMAS
+       help
+         Support for the watchdog in the Palmas family of PMICs. When the
+         watchdog times out system will be reset.
+
 # ALPHA Architecture
 
 # ARM Architecture