From patchwork Thu Jan 14 18:51: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: 72917 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 o0EIpaK9016991 for ; Thu, 14 Jan 2010 18:51:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754152Ab0ANSvf (ORCPT ); Thu, 14 Jan 2010 13:51:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754728Ab0ANSvf (ORCPT ); Thu, 14 Jan 2010 13:51:35 -0500 Received: from mail-pw0-f42.google.com ([209.85.160.42]:50785 "EHLO mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752282Ab0ANSve (ORCPT ); Thu, 14 Jan 2010 13:51:34 -0500 Received: by pwj9 with SMTP id 9so256907pwj.21 for ; Thu, 14 Jan 2010 10:51:32 -0800 (PST) Received: by 10.142.4.29 with SMTP id 29mr829642wfd.127.1263495091971; Thu, 14 Jan 2010 10:51:31 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 23sm783056pzk.0.2010.01.14.10.51.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 14 Jan 2010 10:51:31 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: "Aguirre, Sergio" Subject: [PATCH 15/13] PM debug: Fix warning when no CONFIG_DEBUG_FS Date: Thu, 14 Jan 2010 10:51:27 -0800 Message-Id: <1263495087-2104-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1262973571-25796-1-git-send-email-khilman@deeprootsystems.com> References: <1262973571-25796-1-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 562d190..a086626 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -54,8 +54,6 @@ int omap2_pm_debug; regs[reg_count++].val = \ __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off))) -static int __init pm_dbg_init(void); - void omap2_pm_dump(int mode, int resume, unsigned int us) { struct reg { @@ -167,6 +165,8 @@ struct dentry *pm_dbg_dir; static int pm_dbg_init_done; +static int __init pm_dbg_init(void); + enum { DEBUG_FILE_COUNTERS = 0, DEBUG_FILE_TIMERS,