From patchwork Fri Oct 1 21:01:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 224982 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 o91L1Tqb022188 for ; Fri, 1 Oct 2010 21:01:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756356Ab0JAVB2 (ORCPT ); Fri, 1 Oct 2010 17:01:28 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:56120 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756202Ab0JAVB2 (ORCPT ); Fri, 1 Oct 2010 17:01:28 -0400 Received: by mail-iw0-f174.google.com with SMTP id 5so4265595iwn.19 for ; Fri, 01 Oct 2010 14:01:27 -0700 (PDT) Received: by 10.231.11.66 with SMTP id s2mr6233911ibs.167.1285966887411; Fri, 01 Oct 2010 14:01:27 -0700 (PDT) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id r3sm1581161ibk.13.2010.10.01.14.01.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 01 Oct 2010 14:01:26 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Lo=C3=AFc=20Minier?= Subject: [PATCH 2/2] OMAP: PM: Fix build when CONFIG_PM_DEBUG isn't set Date: Fri, 1 Oct 2010 14:01:20 -0700 Message-Id: <1285966880-26448-3-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.2.1 In-Reply-To: <1285966880-26448-1-git-send-email-khilman@deeprootsystems.com> References: <1285966880-26448-1-git-send-email-khilman@deeprootsystems.com> MIME-Version: 1.0 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]); Fri, 01 Oct 2010 21:01:29 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 77770a1..0d75bfd 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -13,9 +13,6 @@ #include -extern u32 enable_off_mode; -extern u32 sleep_while_idle; - extern void *omap3_secure_ram_storage; extern void omap3_pm_off_mode_enable(int); extern void omap_sram_idle(void); @@ -50,10 +47,14 @@ extern struct omap_dm_timer *gptimer_wakeup; extern void omap2_pm_dump(int mode, int resume, unsigned int us); extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds); extern int omap2_pm_debug; +extern u32 enable_off_mode; +extern u32 sleep_while_idle; #else #define omap2_pm_dump(mode, resume, us) do {} while (0); #define omap2_pm_wakeup_on_timer(seconds, milliseconds) do {} while (0); #define omap2_pm_debug 0 +#define enable_off_mode 0 +#define sleep_while_idle 0 #endif #if defined(CONFIG_CPU_IDLE)