OMAP3: PM: Fix compilation error observed when cpufreq is disabled

Commit Message

Ranjith Lohithakshan March 19, 2010, 10:46 a.m. UTC

None

Patch

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);