From patchwork Fri Mar 19 10:46:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjith Lohithakshan X-Patchwork-Id: 86912 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2JAhxpY004451 for ; Fri, 19 Mar 2010 10:46:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751313Ab0CSKqy (ORCPT ); Fri, 19 Mar 2010 06:46:54 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:50097 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750949Ab0CSKqy (ORCPT ); Fri, 19 Mar 2010 06:46:54 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2JAknMB029459 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Mar 2010 05:46:52 -0500 Received: from psplinux050.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o2JAklHn003833; Fri, 19 Mar 2010 16:16:48 +0530 (IST) Received: from psplinux050.india.ti.com (localhost [127.0.0.1]) by psplinux050.india.ti.com (8.13.1/8.13.1) with ESMTP id o2JAklRv032066; Fri, 19 Mar 2010 16:16:47 +0530 Received: (from a0876318@localhost) by psplinux050.india.ti.com (8.13.1/8.13.1/Submit) id o2JAkkcE032061; Fri, 19 Mar 2010 16:16:46 +0530 From: Ranjith Lohithakshan To: linux-omap@vger.kernel.org Cc: khilman@deeprootsystems.com, ranjithl@ti.com Subject: [PATCH] OMAP3: PM: Fix compilation error observed when cpufreq is disabled Date: Fri, 19 Mar 2010 16:16:46 +0530 Message-Id: <1268995606-32018-1-git-send-email-ranjithl@ti.com> X-Mailer: git-send-email 1.6.2.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 (demeter.kernel.org [140.211.167.41]); Fri, 19 Mar 2010 10:46:55 +0000 (UTC) diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index a6d0b34..498cb5b 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -492,7 +492,11 @@ struct clk_functions omap2_clk_functions = { .clk_disable_unused = omap2_clk_disable_unused, #ifdef CONFIG_CPU_FREQ /* These will be removed when the OPP code is integrated */ +#ifdef CONFIG_ARCH_OMAP3 + .clk_init_cpufreq_table = omap3_clk_init_cpufreq_table, +#else .clk_init_cpufreq_table = omap2_clk_init_cpufreq_table, +#endif .clk_exit_cpufreq_table = omap2_clk_exit_cpufreq_table, #endif }; diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index 57522de..d5153b6 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c @@ -3560,8 +3560,6 @@ int __init omap3xxx_clk_init(void) else dpll4_dd = dpll4_dd_34xx; - omap2_clk_functions.clk_init_cpufreq_table = - omap3_clk_init_cpufreq_table; clk_init(&omap2_clk_functions); for (c = omap3xxx_clks; c < omap3xxx_clks + ARRAY_SIZE(omap3xxx_clks);