From patchwork Wed Dec 22 23:04:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 428841 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 oBMN4MWI009829 for ; Wed, 22 Dec 2010 23:04:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752422Ab0LVXEV (ORCPT ); Wed, 22 Dec 2010 18:04:21 -0500 Received: from mail-pz0-f42.google.com ([209.85.210.42]:41234 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751394Ab0LVXEV (ORCPT ); Wed, 22 Dec 2010 18:04:21 -0500 Received: by pzk9 with SMTP id 9so1840907pzk.1 for ; Wed, 22 Dec 2010 15:04:20 -0800 (PST) Received: by 10.142.245.14 with SMTP id s14mr6026429wfh.174.1293059060673; Wed, 22 Dec 2010 15:04:20 -0800 (PST) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id w22sm9767053wfd.19.2010.12.22.15.04.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 22 Dec 2010 15:04:19 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Charles Manning Subject: [PATCH] OMAP2: PM: fix compile error when !CONFIG_SUSPEND Date: Wed, 22 Dec 2010 15:04:17 -0800 Message-Id: <1293059057-16490-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.3.4 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 23:04:23 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index 2844b84..dac2d1d 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c @@ -299,6 +299,7 @@ out: local_irq_enable(); } +#ifdef CONFIG_SUSPEND static int omap2_pm_begin(suspend_state_t state) { disable_hlt(); @@ -355,6 +356,9 @@ static struct platform_suspend_ops omap_pm_ops = { .end = omap2_pm_end, .valid = suspend_valid_only_mem, }; +#else +static const struct platform_suspend_ops __initdata omap_pm_ops; +#endif /* CONFIG_SUSPEND */ /* XXX This function should be shareable between OMAP2xxx and OMAP3 */ static int __init clkdms_setup(struct clockdomain *clkdm, void *unused)