---

yaml --- r: 231286 b: refs/heads/master c: 1aa023b h: refs/heads/master v: v3
git-mirror · Jan 11, 2011 · 47f1f57 · 47f1f57
1 parent 2195f68
commit 47f1f57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0fdcfa8e9a994176ff1070dced50eeff5f6f851
+refs/heads/master: 1aa023b8fda8096caf41c20427a0ef396d88eb0f
diff --git a/trunk/arch/arm/mach-integrator/cpu.c b/trunk/arch/arm/mach-integrator/cpu.c
@@ -173,7 +173,7 @@ static unsigned int integrator_get(unsigned int cpu)
 
 	if (machine_is_integrator()) {
 		vco.s = (cm_osc >> 8) & 7;
-	} else if (machine_is_cintegrator()) {
+	} else {
 		vco.s = 1;
 	}
 	vco.v = cm_osc & 255;