From patchwork Wed Dec 22 20:19:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Manning X-Patchwork-Id: 428551 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBMKF9OZ017415 for ; Wed, 22 Dec 2010 20:19:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751637Ab0LVUTa (ORCPT ); Wed, 22 Dec 2010 15:19:30 -0500 Received: from smtp.scorch.co.nz ([27.110.127.199]:39430 "HELO scorch.co.nz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1751193Ab0LVUTa (ORCPT ); Wed, 22 Dec 2010 15:19:30 -0500 Received: (qmail 9667 invoked by uid 453); 22 Dec 2010 20:19:27 -0000 X-Virus-Checked: Checked by ClamAV on scorch.co.nz Received: from Unknown (HELO linux-dual-head.local) (10.14.21.25) by scorch.co.nz (qpsmtpd/0.40) with ESMTP; Thu, 23 Dec 2010 09:19:27 +1300 From: Charles Manning To: linux-omap@vger.kernel.org Subject: Fix pm24xx.c compilation problem Date: Thu, 23 Dec 2010 09:19:26 +1300 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201012230919.26344.manningc2@actrix.gen.nz> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Dec 2010 20:19:31 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index aaeea49..ae6abda 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c @@ -53,8 +53,8 @@ #include #include -#ifdef CONFIG_SUSPEND static suspend_state_t suspend_state = PM_SUSPEND_ON; +#ifdef CONFIG_SUSPEND static inline bool is_suspending(void) { return (suspend_state != PM_SUSPEND_ON); @@ -314,6 +314,7 @@ static int omap2_pm_prepare(void) static int omap2_pm_suspend(void) { +#ifdef CONFIG_SUSPEND u32 wken_wkup, mir1; wken_wkup = prm_read_mod_reg(WKUP_MOD, PM_WKEN); @@ -329,7 +330,7 @@ static int omap2_pm_suspend(void) omap_writel(mir1, 0x480fe0a4); prm_write_mod_reg(wken_wkup, WKUP_MOD, PM_WKEN); - +#endif return 0; }