Merge remote branch 'wireless-next/master' into ath6kl-next

[~andy/linux] / arch / arm / mach-omap1 / clock.c

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 67382ddd8c83fe7a4464a2c36d1a2d22979e437a..a9ee06b6cb42a72b262d92434eaf31f87b4abdea 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -194,9 +194,8 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate)
 {
        /* Find the highest supported frequency <= rate and switch to it */
        struct mpu_rate * ptr;
-       unsigned long dpll1_rate, ref_rate;
+       unsigned long ref_rate;
 
-       dpll1_rate = ck_dpll1_p->rate;
        ref_rate = ck_ref_p->rate;
 
        for (ptr = omap1_rate_table; ptr->rate; ptr++) {