commit e258cf07bd95422f2b73c8c0cb183bd5b71942ee
author Ankur Nandwani <ankurn@codeaurora.org> Fri Aug 19 10:16:38 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:15:45 2011 -0700
tree 48184ec6ac55bfac0f9635cccb727c9a7376107a
parent dd7ef89bddd952ae751e2c74d5f7094c13e48f8e

msm: 8960: Add the WCNSS restart module for 8960

This driver monitors WCNSS hardware watchdog interrupt line,
and it plugs WCNSS into Subsytem restart framework.

Acked-by: Sameer Thalappil<sameert@qca.qualcomm.com>
Signed-off-by: Ankur Nandwani <ankurn@codeaurora.org>

Conflicts:

	arch/arm/configs/msm8960_defconfig

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index c74ca7c..d6e14d1 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -55,6 +55,7 @@
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_MODEM_8960=y
 CONFIG_MSM_BUS_SCALING=y
+CONFIG_MSM_WCNSS_SSR_8960=y
 CONFIG_MSM_WATCHDOG=y
 CONFIG_MSM_DLOAD_MODE=y
 CONFIG_MSM_SLEEP_STATS=y