linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-omap1 / clock.c

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 619db18..75110ba 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -345,7 +345,7 @@ static unsigned calc_ext_dsor(unsigned long rate)
         */
        for (dsor = 2; dsor < 96; ++dsor) {
                if ((dsor & 1) && dsor > 8)
-                       continue;
+                       continue;
                if (rate >= 96000000 / dsor)
                        break;
        }
@@ -687,11 +687,6 @@ int __init omap1_clk_init(void)
                        clk_register(*clkp);
                        continue;
                }
-
-               if (((*clkp)->flags &CLOCK_IN_OMAP310) && cpu_is_omap310()) {
-                       clk_register(*clkp);
-                       continue;
-               }
        }
 
        info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);
@@ -789,7 +784,7 @@ int __init omap1_clk_init(void)
        clk_enable(&armxor_ck.clk);
        clk_enable(&armtim_ck.clk); /* This should be done by timer code */
 
-       if (cpu_is_omap15xx())
+       if (cpu_is_omap1510())
                clk_enable(&arm_gpio_ck);
 
        return 0;