Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi

[~andy/linux] / arch / arm / plat-samsung / Kconfig

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index ca27cc9ac4bff0218ff909d2f018cdbaeafe5b5a..3dc5cbea86cc9cc838d5b864f0eabaed76777e23 100644 (file)
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -502,6 +502,12 @@ config SAMSUNG_WAKEMASK
          and above. This code allows a set of interrupt to wakeup-mask
          mappings. See <plat/wakeup-mask.h>
 
+config SAMSUNG_WDT_RESET
+       bool
+       help
+         Compile support for system restart by triggering watchdog reset.
+         Used on SoCs that do not provide dedicated reset control.
+
 config S5P_PM
        bool
        help