From 91ca4c3fe94e963be5a7ba7b5b83d33fdabe5cfd Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@codeaurora.org>
Date: Thu, 4 Mar 2010 14:06:56 -0800
Subject: [PATCH] --- yaml --- r: 192148 b: refs/heads/master c:
 4eab62519f8f58aa5f72787877c459925399d617 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-msm/acpuclock-arm11.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1faf5d92735..db80a99ced86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4783de9bba3dd607e6aa4d0a7dd598d9094c044c
+refs/heads/master: 4eab62519f8f58aa5f72787877c459925399d617
diff --git a/trunk/arch/arm/mach-msm/acpuclock-arm11.c b/trunk/arch/arm/mach-msm/acpuclock-arm11.c
index f9c9035bd9bb..af5e85b91d02 100644
--- a/trunk/arch/arm/mach-msm/acpuclock-arm11.c
+++ b/trunk/arch/arm/mach-msm/acpuclock-arm11.c
@@ -135,6 +135,8 @@ static struct clkctl_acpu_speed  acpu_freq_tbl[] = {
 };
 #endif
 
+
+#ifdef CONFIG_CPU_FREQ_TABLE
 static struct cpufreq_frequency_table freq_table[] = {
 	{ 0, 122880 },
 	{ 1, 128000 },
@@ -143,6 +145,7 @@ static struct cpufreq_frequency_table freq_table[] = {
 	{ 4, 528000 },
 	{ 5, CPUFREQ_TABLE_END },
 };
+#endif
 
 static int pc_pll_request(unsigned id, unsigned on)
 {