From f18e3285c9594e761a3e8e90922351a803b9cd5c Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Sun, 5 Jun 2011 16:42:54 -0500 Subject: [PATCH] --- yaml --- r: 257931 b: refs/heads/master c: 23457bc9566be64f33afdc159aadd42712673e0b h: refs/heads/master i: 257929: 3c71e72366e3203fe7d87c202d39fd68e3f04291 257927: 04519cf6b1b39c5ae19f770a9a5a084b325acb62 v: v3 --- [refs] | 2 +- trunk/drivers/crypto/caam/ctrl.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3bd9b2b23345..dbac9d045f27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfa2b54eca28103d07e5334aa06b78321fbe1d9a +refs/heads/master: 23457bc9566be64f33afdc159aadd42712673e0b diff --git a/trunk/drivers/crypto/caam/ctrl.c b/trunk/drivers/crypto/caam/ctrl.c index 9009713a3c2e..fc2d9ed22470 100644 --- a/trunk/drivers/crypto/caam/ctrl.c +++ b/trunk/drivers/crypto/caam/ctrl.c @@ -52,9 +52,11 @@ static int caam_probe(struct platform_device *pdev) struct caam_ctrl __iomem *ctrl; struct caam_full __iomem *topregs; struct caam_drv_private *ctrlpriv; - struct caam_perfmon *perfmon; struct caam_deco **deco; u32 deconum; +#ifdef CONFIG_DEBUG_FS + struct caam_perfmon *perfmon; +#endif ctrlpriv = kzalloc(sizeof(struct caam_drv_private), GFP_KERNEL); if (!ctrlpriv)