From patchwork Thu Jan 7 01:22:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 71511 X-Patchwork-Delegate: paul@pwsan.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 o071OKHH012393 for ; Thu, 7 Jan 2010 01:24:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932415Ab0AGBYW (ORCPT ); Wed, 6 Jan 2010 20:24:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932307Ab0AGBYT (ORCPT ); Wed, 6 Jan 2010 20:24:19 -0500 Received: from utopia.booyaka.com ([72.9.107.138]:37137 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756132Ab0AGBYS (ORCPT ); Wed, 6 Jan 2010 20:24:18 -0500 Received: (qmail 15769 invoked by uid 526); 7 Jan 2010 01:24:17 -0000 MBOX-Line: From nobody Wed Jan 6 18:22:05 2010 Subject: [PATCH v2 2/5] OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org From: Paul Walmsley Cc: Felipe Balbi Date: Wed, 06 Jan 2010 18:22:05 -0700 Message-ID: <20100107012201.3551.91538.stgit@localhost.localdomain> In-Reply-To: <20100107011932.3551.75659.stgit@localhost.localdomain> References: <20100107011932.3551.75659.stgit@localhost.localdomain> User-Agent: StGit/0.15-22-gda30 MIME-Version: 1.0 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/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c index d0e3fb7..ce6742f 100644 --- a/arch/arm/mach-omap2/clock2xxx.c +++ b/arch/arm/mach-omap2/clock2xxx.c @@ -455,12 +455,15 @@ static struct cpufreq_frequency_table freq_table[ARRAY_SIZE(rate_table)]; void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) { struct prcm_config *prcm; + long sys_ck_rate; int i = 0; + sys_ck_rate = clk_get_rate(sclk); + for (prcm = rate_table; prcm->mpu_speed; prcm++) { if (!(prcm->flags & cpu_mask)) continue; - if (prcm->xtal_speed != sys_ck.rate) + if (prcm->xtal_speed != sys_ck_rate) continue; /* don't put bypass rates in table */