summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-02-28 16:41:33 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 09:02:33 +0100
commit33c496894befe8905703cd2e7f3525e56061b66d (patch)
tree8ceec504f5a79393e25d4351ef4976b88aabcb88 /drivers/misc
parentc7dfb5385f14e03e25aab6bd7e1ff1a1275b94a3 (diff)
MISC: SHRM: Fix build warning
ST-Ericsson Linux next: Not tested, ask SSM for ER ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ic7f0aecbea1555b78ead3d0dd681eadcca5a2d8e Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17149
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/shrm/shrm_protocol.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/shrm/shrm_protocol.c b/drivers/misc/shrm/shrm_protocol.c
index dd52f9e20ea..6afe423d2cb 100644
--- a/drivers/misc/shrm/shrm_protocol.c
+++ b/drivers/misc/shrm/shrm_protocol.c
@@ -465,7 +465,7 @@ void shm_ca_wake_req_work(struct work_struct *work)
writel((1<<GOP_CA_WAKE_ACK_BIT),
shm_dev->intr_base + GOP_SET_REGISTER_BASE);
}
-
+#ifdef CONFIG_U8500_SHRM_MODEM_SILENT_RESET
static int shrm_modem_reset_sequence(void)
{
int err;
@@ -539,6 +539,7 @@ static int shrm_modem_reset_sequence(void)
return err;
}
+#endif
static void shrm_modem_reset_callback(unsigned long irq)
{