commit | c1f62daa686a0af8e3a7047df7be30e49d88616e | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Sun Nov 18 00:23:51 2012 -0800 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sun Nov 18 00:23:51 2012 -0800 |
tree | 45401d86fcfcd30ba8b9d619a274567189859def | |
parent | c00b5526c451ac8342f958bc48c67d285d116be4 [diff] | |
parent | f09dbc782e36da1e22909bb81ed535f252d7f989 [diff] |
Merge "defconfig: 8910: enable watchdog in defconfig"
diff --git a/arch/arm/configs/msm8910_defconfig b/arch/arm/configs/msm8910_defconfig index 38e1cfd..e2e05b2 100644 --- a/arch/arm/configs/msm8910_defconfig +++ b/arch/arm/configs/msm8910_defconfig
@@ -43,6 +43,7 @@ CONFIG_MSM_SMD_PKG4=y # CONFIG_MSM_HW3D is not set CONFIG_MSM_DIRECT_SCLK_ACCESS=y +CONFIG_MSM_WATCHDOG_V2=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_SMP_ON_UP is not set