From patchwork Tue Apr 7 08:57:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 16756 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n378w9N3006251 for ; Tue, 7 Apr 2009 08:58:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751202AbZDGI6J (ORCPT ); Tue, 7 Apr 2009 04:58:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751244AbZDGI6I (ORCPT ); Tue, 7 Apr 2009 04:58:08 -0400 Received: from smtp.nokia.com ([192.100.122.230]:56538 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751202AbZDGI6H (ORCPT ); Tue, 7 Apr 2009 04:58:07 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx03.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n378vXBm021937; Tue, 7 Apr 2009 11:57:59 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 7 Apr 2009 11:57:49 +0300 Received: from mgw-int02.ntc.nokia.com ([172.21.143.97]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Tue, 7 Apr 2009 11:57:33 +0300 Received: from [172.21.39.110] (esdhcp039110.research.nokia.com [172.21.39.110]) by mgw-int02.ntc.nokia.com (Switch-3.2.5/Switch-3.2.5) with ESMTP id n378vUHn031108; Tue, 7 Apr 2009 11:57:32 +0300 Message-ID: <49DB1560.4050609@nokia.com> Date: Tue, 07 Apr 2009 11:57:04 +0300 From: Roger Quadros User-Agent: Thunderbird 2.0.0.21 (X11/20090318) MIME-Version: 1.0 To: Kevin Hilman CC: linux-omap@vger.kernel.org Subject: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set X-OriginalArrivalTime: 07 Apr 2009 08:57:33.0773 (UTC) FILETIME=[E40E6FD0:01C9B75E] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Roger Quadros Date: Tue, 7 Apr 2009 11:10:29 +0300 Subject: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set Removes undefined symbol link errors. Required symbols are defined in common.c and omap-pm.h Signed-off-by: Roger Quadros --- arch/arm/plat-omap/common.c | 6 ++++++ arch/arm/plat-omap/include/mach/omap-pm.h | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 2866612..634ca39 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -46,6 +46,12 @@ int omap_bootloader_tag_len; struct omap_board_config_kernel *omap_board_config; int omap_board_config_size; +#ifdef CONFIG_OMAP_PM_NONE +struct omap_opp *mpu_opps; +struct omap_opp *dsp_opps; +struct omap_opp *l3_opps; +#endif + #ifdef CONFIG_OMAP_BOOT_TAG static int __init parse_tag_omap(const struct tag *tag) diff --git a/arch/arm/plat-omap/include/mach/omap-pm.h b/arch/arm/plat-omap/include/mach/omap-pm.h index f0bbd36..6a8499a 100644 --- a/arch/arm/plat-omap/include/mach/omap-pm.h +++ b/arch/arm/plat-omap/include/mach/omap-pm.h @@ -58,9 +58,20 @@ extern struct omap_opp *l3_opps; * framework starts. The "_if_" is to avoid name collisions with the * PM idle-loop code. */ +#ifdef CONFIG_OMAP_PM_NONE +static inline int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table, + struct omap_opp *dsp_opp_table, + struct omap_opp *l3_opp_table) { + mpu_opps = 0; + dsp_opps = 0; + l3_opps = 0; + return 0; +} +#else int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table, struct omap_opp *dsp_opp_table, struct omap_opp *l3_opp_table); +#endif /** * omap_pm_if_init - OMAP PM init code called after clock fw init @@ -68,7 +79,11 @@ int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table, * The main initialization code. OPP tables are passed in here. The * "_if_" is to avoid name collisions with the PM idle-loop code. */ +#ifdef CONFIG_OMAP_PM_NONE +static inline int __init omap_pm_if_init(void) { return 0; } +#else int __init omap_pm_if_init(void); +#endif /** * omap_pm_if_exit - OMAP PM exit code