From patchwork Fri Jan 8 17:59:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 71834 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o08HxtJr023737 for ; Fri, 8 Jan 2010 17:59:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753790Ab0AHR7z (ORCPT ); Fri, 8 Jan 2010 12:59:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752749Ab0AHR7y (ORCPT ); Fri, 8 Jan 2010 12:59:54 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:63991 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753783Ab0AHR7x (ORCPT ); Fri, 8 Jan 2010 12:59:53 -0500 Received: by mail-pz0-f171.google.com with SMTP id 1so3897390pzk.33 for ; Fri, 08 Jan 2010 09:59:53 -0800 (PST) Received: by 10.142.56.11 with SMTP id e11mr332097wfa.277.1262973591302; Fri, 08 Jan 2010 09:59:51 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 21sm18824458pzk.15.2010.01.08.09.59.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 08 Jan 2010 09:59:50 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: Manjunatha GK Subject: [PATCH 09/13] OMAP3: PM debug: fix build error when !CONFIG_DEBUG_FS Date: Fri, 8 Jan 2010 09:59:27 -0800 Message-Id: <1262973571-25796-10-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.6.rc2.1.g42108 In-Reply-To: <1262973571-25796-9-git-send-email-khilman@deeprootsystems.com> References: <1262973571-25796-1-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-2-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-3-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-4-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-5-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-6-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-7-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-8-git-send-email-khilman@deeprootsystems.com> <1262973571-25796-9-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 860b755..e9d3993 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -604,6 +604,4 @@ static int __init pm_dbg_init(void) } arch_initcall(pm_dbg_init); -#else -void pm_dbg_update_time(struct powerdomain *pwrdm, int prev) {} #endif diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 0bf345d..7a9c2d0 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -32,12 +32,16 @@ extern struct omap_dm_timer *gptimer_wakeup; #ifdef CONFIG_PM_DEBUG extern void omap2_pm_dump(int mode, int resume, unsigned int us); extern int omap2_pm_debug; +#else +#define omap2_pm_dump(mode, resume, us) do {} while (0); +#define omap2_pm_debug 0 +#endif + +#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev); extern int pm_dbg_regset_save(int reg_set); extern int pm_dbg_regset_init(int reg_set); #else -#define omap2_pm_dump(mode, resume, us) do {} while (0); -#define omap2_pm_debug 0 #define pm_dbg_update_time(pwrdm, prev) do {} while (0); #define pm_dbg_regset_save(reg_set) do {} while (0); #define pm_dbg_regset_init(reg_set) do {} while (0);