X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap1%2Fclock.c;h=75110ba10424626e0f84539bfc2f70e7f603d0aa;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=619db18144ead16b6ecc74d5f8d4aec56090c30e;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 619db1814..75110ba10 100644
--- 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;