Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / char / watchdog / Kconfig

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 2d78962b4de7bd66c77fd9f9c8592ee48bba333b..344001b45af94b3caa8ac0cf83979e224bb61e96 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -139,6 +139,15 @@ config SA1100_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called sa1100_wdt.
 
+config MPCORE_WATCHDOG
+       tristate "MPcore watchdog"
+       depends on WATCHDOG && ARM_MPCORE_PLATFORM && LOCAL_TIMERS
+       help
+         Watchdog timer embedded into the MPcore system.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mpcore_wdt.
+
 # X86 (i386 + ia64 + x86_64) Architecture
 
 config ACQUIRE_WDT