| Message ID | 1389636237-2998-1-git-send-email-balbi@ti.com |
|---|---|
| State | Accepted |
| Commit | 84bef11710d14990f8c1213058c17d85b2ec432b |
| Headers | show
Return-Path: <patchwork-forward+bncBC5M7T4HYEKRBZWV2CLAKGQEYJ57HOI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0AAC42054B for <linaro@patches.linaro.org>; Mon, 13 Jan 2014 18:05:26 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id w17sf7082168vbj.5 for <linaro@patches.linaro.org>; Mon, 13 Jan 2014 10:05:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=4ULDnuM62430mkNDdUmITU1WxXjdCxVzxLiZZGcU1mE=; b=DUkzDx0+DU2K4ONWNoI1X8Bf/3l78JXF2ZKsK8TRn78WFWakZoGDGXxRN9BHC14Pc5 /GbYd2UF26LMZWDBEoNHctOL73gCD8femcPl3mKVjWr5Ujd+i8mDYNyZN7dANpzgVMR0 kSkmtJktAOwapzLRZN4Uj7xr82gyeAyG32IibAnBWXJJjpPSd4m2gsmGsdjaGf9I1tXY poT8ooV5r7B5Azdhdg48DiWs0jg0Xo6V7RuqLL1qgPHxuI+EH9nTuZ8VwQm5BRRa9ciu ZUGDf1o7ZNmn/bB7mMEzLePSy2KNjzqJjgZ5/UPap6uZLOxGWSMlls1H7vHrNmz4wG0l nvtw== X-Gm-Message-State: ALoCoQmQMaoClWcfdsRd+YC/MlZOiwvKAz2fAWbIBsbHXlYMywsqQ3+vuMNXDiPHrwT+DfjG2fT8 X-Received: by 10.236.78.232 with SMTP id g68mr8800249yhe.19.1389636326162; Mon, 13 Jan 2014 10:05:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.82.49 with SMTP id f17ls2663327qey.54.gmail; Mon, 13 Jan 2014 10:05:26 -0800 (PST) X-Received: by 10.58.201.169 with SMTP id kb9mr2216983vec.42.1389636326094; Mon, 13 Jan 2014 10:05:26 -0800 (PST) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id ks3si11359293vec.51.2014.01.13.10.05.26 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Jan 2014 10:05:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id oz11so709941veb.23 for <patchwork-forward@linaro.org>; Mon, 13 Jan 2014 10:05:26 -0800 (PST) X-Received: by 10.52.227.233 with SMTP id sd9mr1976025vdc.53.1389636325999; Mon, 13 Jan 2014 10:05:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp146733ved; Mon, 13 Jan 2014 10:05:25 -0800 (PST) X-Received: by 10.68.245.200 with SMTP id xq8mr30863570pbc.21.1389636325026; Mon, 13 Jan 2014 10:05:25 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yd9si16333099pab.321.2014.01.13.10.05.24; Mon, 13 Jan 2014 10:05:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752028AbaAMSFX (ORCPT <rfc822;patch@linaro.org> + 5 others); Mon, 13 Jan 2014 13:05:23 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:46896 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751568AbaAMSFX (ORCPT <rfc822;linux-omap@vger.kernel.org>); Mon, 13 Jan 2014 13:05:23 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s0DI4wa6002380; Mon, 13 Jan 2014 12:04:58 -0600 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s0DI4wpC031304; Mon, 13 Jan 2014 12:04:58 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Mon, 13 Jan 2014 12:04:58 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s0DI4vPE020361; Mon, 13 Jan 2014 12:04:58 -0600 From: Felipe Balbi <balbi@ti.com> To: Tony Lindgren <tony@atomide.com> CC: Linux OMAP Mailing List <linux-omap@vger.kernel.org>, Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org>, Felipe Balbi <balbi@ti.com> Subject: [PATCH] arm: omap1: fix build when !CONFIG_OMAP_32K_TIMER Date: Mon, 13 Jan 2014 12:03:57 -0600 Message-ID: <1389636237-2998-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.8.5.2 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> Content-Type: text/plain |
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 40a1ae3..dbee729 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -71,7 +71,11 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE]; static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE]; static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE]; -#ifdef CONFIG_OMAP_32K_TIMER +#ifndef CONFIG_OMAP_32K_TIMER + +static unsigned short enable_dyn_sleep = 0; + +#else static unsigned short enable_dyn_sleep = 1;
If CONFIG_OMAP_32K_TIMER isn't enabled, we will try to use enable_dyn_sleep which wasn't defined anywhere. In order to fix the problem, we always define enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER. Signed-off-by: Felipe Balbi <balbi@ti.com> --- arch/arm/mach-omap1/pm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)