From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 11 Jan 2011 13:48:17 +0000 (+0000)
Subject: ARM: integrator: fix compile warning in cpu.c
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1aa023b8fda8096caf41c20427a0ef396d88eb0f;p=linux-beck.git

ARM: integrator: fix compile warning in cpu.c

Fix:
arch/arm/mach-integrator/cpu.c: In function ■integrator_get■:
arch/arm/mach-integrator/cpu.c:164: warning: ■vco.s■ may be used uninitialized in this function

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index a3fbcb3adc29..fbb457779895 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/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;