From 47f1f5702e3f95a5e441ccf86b509a2abad6b610 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 11 Jan 2011 13:48:17 +0000
Subject: [PATCH] --- yaml --- r: 231286 b: refs/heads/master c:
 1aa023b8fda8096caf41c20427a0ef396d88eb0f h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-integrator/cpu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8296dd1780ca..7625505b79cb 100644
--- 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
index a3fbcb3adc29..fbb457779895 100644
--- 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;