commit 790a7b644bec35fe0d604c608c670cebded06a59
author Ed James <edjames@google.com> Fri May 23 08:14:05 2014 -0700
committer Ed James <edjames@google.com> Fri May 23 08:14:05 2014 -0700
tree 7d499e71c2389b5328b9820434d28e1f80bc3845
parent 2ca5e68a324128ed2614c7925b267a60eadf948f

optimus watchdog: allow it to be stopped

	* b/14420969
	* /sbin/poweroff halts system, but watchdog is rebooting
	* needs to shut off watchdog, then sleep.

Change-Id: I4a1371775222b0942f5194ffdc626da0b5b00461

arch/arm/configs/gfrg200_defconfig

diff --git a/arch/arm/configs/gfrg200_defconfig b/arch/arm/configs/gfrg200_defconfig
index 42eb8ea..06b2470 100644
--- a/arch/arm/configs/gfrg200_defconfig
+++ b/arch/arm/configs/gfrg200_defconfig
@@ -243,7 +243,6 @@
 CONFIG_SENSORS_LM63=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
-CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_COMCERTO_WATCHDOG=y
 # CONFIG_HID_SUPPORT is not set
 CONFIG_USB=y